5月5日系统修改完成 1.0

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -51,4 +51,6 @@ public interface StoreMapper {
     int selEffStore(String plateNo);
 
     void updateByOutId(String id, String noUserParam, String userId, String belongId);
+
+    int updateFKByPKey(Store store);
 }

src/main/java/com/th/demo/model/ware/ChangeRecord.java

@@ -67,6 +67,9 @@ public class ChangeRecord {
 
     private String productionPlace;
 
+    private String fkCustomerNameOld;
+    private String fkCustomerNameNew;
+
     public String getId() {
         return id;
     }
@@ -314,4 +317,20 @@ public class ChangeRecord {
     public void setProductionPlace(String productionPlace) {
         this.productionPlace = productionPlace;
     }
+
+    public String getFkCustomerNameOld() {
+        return fkCustomerNameOld;
+    }
+
+    public void setFkCustomerNameOld(String fkCustomerNameOld) {
+        this.fkCustomerNameOld = fkCustomerNameOld;
+    }
+
+    public String getFkCustomerNameNew() {
+        return fkCustomerNameNew;
+    }
+
+    public void setFkCustomerNameNew(String fkCustomerNameNew) {
+        this.fkCustomerNameNew = fkCustomerNameNew;
+    }
 }

src/main/java/com/th/demo/model/ware/InRecord.java

@@ -62,6 +62,10 @@ public class InRecord {
 
     private String fkComponyName;
 
+    private String contractNo;
+    private String packNo;
+    private String outFlag;
+
     public String getFkComponyName() {
         return fkComponyName;
     }
@@ -322,4 +326,28 @@ public class InRecord {
     public void setReceiveAddress(String receiveAddress) {
         this.receiveAddress = receiveAddress == null ? null : receiveAddress.trim();
     }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public String getPackNo() {
+        return packNo;
+    }
+
+    public void setPackNo(String packNo) {
+        this.packNo = packNo;
+    }
+
+    public String getOutFlag() {
+        return outFlag;
+    }
+
+    public void setOutFlag(String outFlag) {
+        this.outFlag = outFlag;
+    }
 }

src/main/java/com/th/demo/model/ware/Store.java

@@ -90,6 +90,7 @@ public class Store  implements Comparable<Store>{
     private String attrib08;
     private String attrib09;
     private String attrib10;
+    private double changeCount; // 合约号
 
     private String fkCustomerName;
 
@@ -567,6 +568,14 @@ public class Store  implements Comparable<Store>{
         this.payWay = payWay;
     }
 
+    public double getChangeCount() {
+        return changeCount;
+    }
+
+    public void setChangeCount(double changeCount) {
+        this.changeCount = changeCount;
+    }
+
     @Override
     public int compareTo(Store o) {
         if (this.layer > o.getLayer()) {

src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java

@@ -3,6 +3,7 @@ package com.th.demo.service.impl.ware;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.th.demo.mapping.finance.AccountDetailMapper;
+import com.th.demo.mapping.maint.CustomerMapper;
 import com.th.demo.mapping.maint.PriceMapper;
 import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.ware.ChangeRecordMapper;
@@ -38,6 +39,8 @@ public class ChangeServiceImpl implements ChangeService {
     public PriceMapper priceMapper;
     @Autowired
     public StoreMapper storeMapper;
+    @Autowired
+    public CustomerMapper customerMapper;
 
     int num = 0;
     String result = Type.FAIL;
@@ -48,8 +51,9 @@ public class ChangeServiceImpl implements ChangeService {
     public String changeCustomer(String json, String customer,String address,String userId, String belongId) throws Exception{
         List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {
         });
-        Customer c = JSON.parseObject(customer, new TypeReference<Customer>() {
+        Customer c1 = JSON.parseObject(customer, new TypeReference<Customer>() {
         });
+        Customer c = customerMapper.selectByPrimaryKey(c1.getId());
         String recordType = "";
         for (int i = 0; i < list.size(); i++) {
             if(list.get(i).getCustomer().getName().equals(c.getName())){
@@ -59,18 +63,21 @@ public class ChangeServiceImpl implements ChangeService {
                 AccountDetail accountDetail = getAccountDetail(list.get(i),  userId, belongId);
                 num += accountDetailMapper.insert(accountDetail);
             }
-            ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), c, address, userId, belongId);
+            Customer customer1 = customerMapper.selectByPrimaryKey(list.get(i).getFkComponyId());
+            ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), c, customer1, address, userId, belongId);
             num += changeRecordMapper.insert(changeRecord);
 
 
+            list.get(i).setFkComponyId(list.get(i).getCustomer().getId());
             list.get(i).setCustomer(c);
             list.get(i).setReceiveAddress(address);
-            num += storeMapper.updateByPrimaryKey(list.get(i));
+            list.get(i).setChangeCount(list.get(i).getChangeCount()+1);
+            num += storeMapper.updateFKByPKey(list.get(i));
         }
         return Tools.moreThanZeroResultJSON(num);
     }
 
-    private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, String receiveAddress, String userId, String belongId) {
+    private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, Customer customer1, String receiveAddress, String userId, String belongId) {
 
         ChangeRecord record = new ChangeRecord();
         record.setRecordType(recordType);
@@ -86,6 +93,10 @@ public class ChangeServiceImpl implements ChangeService {
             record.setCustomerNameNew(customer.getName());
         }
         record.setCustomerNameOld(store.getCustomer().getName());
+
+        record.setFkCustomerNameNew(store.getCustomer().getName());
+        record.setFkCustomerNameOld(customer1.getName());
+
         record.setCount(store.getCount());
         record.setWeight(store.getWeight());
         record.setRemark(store.getRemark());
@@ -115,10 +126,6 @@ public class ChangeServiceImpl implements ChangeService {
             changeTime = list.size();
             changeTimeForPrice = 1;
         }
-       /* Price price = priceMapper.selectByMaterialChangeTime(store.getMaterial().getId(), changeTimeForPrice, belongId);
-        if (price == null) {
-            throw new Exception(store.getMaterial().getName() + "," + store.getMaterial().getStandard() + "没有对应价格信息");
-        }*/
         AccountDetail accountDetail = new AccountDetail();
         accountDetail.setChangeTime(changeTime);
         accountDetail.setRecordType("货权转移");
@@ -138,10 +145,6 @@ public class ChangeServiceImpl implements ChangeService {
         accountDetail.setAddTime(new Date());
         accountDetail.setCancelFlag("0");
         accountDetail.setBelongId(belongId);
-
-        //storagePrice = price.getStoragePrice() * store.getWeight();
-
-        //accountDetail.setStorageUnitPrice(price.getStoragePrice());
         accountDetail.setStoragePrice(storagePrice);
 
         //accountDetail.setWeightUnitPrice(price.getWeightPrice());

src/main/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -168,6 +168,8 @@ public class InServiceImpl implements InService {
                     //listStore.get(i).setOutId(outRecord.getId());
                     listStore.get(i).setCancelFlag("1");
                     num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                    num += inRecordMapper.deleteByPrimaryKey(listStore.get(i).getInId());
+
                 }
                 result = Tools.moreThanZeroResultJSON(num);
             }
@@ -476,7 +478,15 @@ public class InServiceImpl implements InService {
         inRecord.setAddUser(new SysUser(userId));
         inRecord.setAddTime(new Date());
         inRecord.setRecordType(recordType);
-        inRecord.setCancelFlag("0");
+        if (recordType.equals("0")){
+            inRecord.setCancelFlag("9");
+        }else {
+            inRecord.setCancelFlag("0");
+        }
+        inRecord.setOutFlag("0");
+        inRecord.setPackNo(store.getPackNo());
+        inRecord.setContractNo(store.getContractNo());
+
         inRecord.setReceiveAddress(store.getReceiveAddress());
 
         inRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());

src/main/resource/mapper/ware/ChangeRecordMapper.xml

@@ -12,6 +12,10 @@
     <result column="model" property="model" jdbcType="VARCHAR" />
     <result column="customer_name_old" property="customerNameOld" jdbcType="VARCHAR" />
     <result column="customer_name_new" property="customerNameNew" jdbcType="VARCHAR" />
+
+    <result column="fk_customer_name_old" property="fkCustomerNameOld" jdbcType="VARCHAR" />
+    <result column="fk_customer_name_new" property="fkCustomerNameNew" jdbcType="VARCHAR" />
+
     <result column="record_type" property="recordType" jdbcType="VARCHAR" />
     <result column="count" property="count" jdbcType="DOUBLE" />
     <result column="weight" property="weight" jdbcType="DOUBLE" />
@@ -47,7 +51,7 @@
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name_old, 
     customer_name_new, record_type, count, weight, remark, add_id, add_time, modify_id, 
     modify_time, cancel_id, cancel_time, cancel_flag, belong_id, plate_no, in_id, out_id, 
-    receive_address_old, receive_address_new,wgt_dcn_mtc_cd,edge_ty,production_place
+    receive_address_old, receive_address_new,wgt_dcn_mtc_cd,edge_ty,production_place,fk_customer_name_new,fk_customer_name_old
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -74,7 +78,8 @@
       cancel_id, cancel_time, cancel_flag, 
       belong_id, plate_no, in_id, 
       out_id, receive_address_old, receive_address_new
-    ,wgt_dcn_mtc_cd,edge_ty,production_place
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,
+    fk_customer_name_old,fk_customer_name_new
       )
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
@@ -85,7 +90,8 @@
       #{cancelId,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, 
       #{belongId,jdbcType=VARCHAR}, #{plateNo,jdbcType=VARCHAR}, #{inId,jdbcType=VARCHAR}, 
       #{outId,jdbcType=VARCHAR}, #{receiveAddressOld,jdbcType=VARCHAR}, #{receiveAddressNew,jdbcType=VARCHAR}
-    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR}
+    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},
+        #{fkCustomerNameOld,jdbcType=VARCHAR},#{fkCustomerNameNew,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.ChangeRecord" >

src/main/resource/mapper/ware/InRecordMapper.xml

@@ -33,6 +33,11 @@
     <result column="ord_no" property="ordNo" jdbcType="VARCHAR" />
     <result column="tally_people" property="tallyPeople" jdbcType="VARCHAR" />
     <result column="fk_compony_name" property="fkComponyName" jdbcType="VARCHAR" />
+
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
+    <result column="pack_no" property="packNo" jdbcType="VARCHAR" />
+    <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
+
     <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
 
   </resultMap>
@@ -43,7 +48,7 @@
   <sql id="Base_Column_List" >
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
     customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
-    cancel_time, cancel_flag, belong_id, plate_no,record_type,receive_address ,wgt_dcn_mtc_cd,edge_ty,production_place
+    cancel_time, cancel_flag, belong_id, plate_no,record_type,receive_address ,wgt_dcn_mtc_cd,edge_ty,production_place,contract_no,pack_no,out_flag
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -51,10 +56,10 @@
     from t_ware_in_record
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from t_ware_in_record
+  <update id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    update t_ware_in_record set cancel_flag = '9'
     where id = #{id,jdbcType=VARCHAR}
-  </delete>
+  </update>
   <insert id="insert" parameterType="com.th.demo.model.ware.InRecord" >
 
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.String">
@@ -69,7 +74,8 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,record_type,receive_address
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name
+    ,contract_no,pack_no,out_flag)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -79,7 +85,8 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{plateNo,jdbcType=VARCHAR},#{recordType,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}
     ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{carNo,jdbcType=VARCHAR}
-    ,#{ordNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR})
+    ,#{ordNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR}
+    ,#{contractNo,jdbcType=VARCHAR},#{packNo,jdbcType=VARCHAR},#{outFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.InRecord" >
     insert into t_ware_in_record
@@ -313,7 +320,10 @@
       belong_id = #{belongId,jdbcType=VARCHAR},
       plate_no = #{plateNo,jdbcType=VARCHAR},
          record_type = #{recordType,jdbcType=VARCHAR},
-    receive_address = #{receiveAddress,jdbcType=VARCHAR}
+    receive_address = #{receiveAddress,jdbcType=VARCHAR},
+        contract_no= #{contractNo,jdbcType=VARCHAR},
+        pack_no= #{packNo,jdbcType=VARCHAR},
+        out_flag= #{outFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

src/main/resource/mapper/ware/StoreMapper.xml

@@ -53,6 +53,8 @@
     <result column="inware_day" property="inwareDay" jdbcType="DOUBLE" />
     <result column="pay_way" property="payWay" jdbcType="VARCHAR" />
 
+    <result column="change_count" property="changeCount" jdbcType="DOUBLE" />
+
 
     <association  column="ware_id" property="ware" select="com.th.demo.mapping.maint.WareMapper.selectByPrimaryKey" />
     <association  column="stack_id" property="stack" select="com.th.demo.mapping.maint.StackMapper.selectByPrimaryKey" />
@@ -373,6 +375,14 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
+  <update id="updateFKByPKey" parameterType="com.th.demo.model.ware.Store" >
+    update t_ware_store
+    set customer_id = #{customer.id,jdbcType=VARCHAR},
+        fk_compony_id = #{fkComponyId,jdbcType=VARCHAR},
+        change_count = #{changeCount,jdbcType=DOUBLE}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
 
 
   <select id="selectLayerByStackId" resultType="java.lang.String" >
@@ -575,6 +585,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       select count(*)
       from t_ware_store t
       where t.cancel_flag = '0'
+      and t.out_flag = '0'
       and t.plate_no = #{param1,jdbcType=VARCHAR};
 
   </select>