1.垛位操作导入入库明细表 新增合约号字段

2.出库操作导入出库明细表字段 新增合约号字段
3.导出入库明细表excel 新增合约号字段
4.导出出库明细表excel 新增合约号字段

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

@@ -63,7 +63,7 @@ public class InRecord {
     private String fkComponyName;
     private double invoicePrice;
     private String remark1;
-
+    private String contractNo;
     public double getInvoicePrice() {
         return invoicePrice;
     }
@@ -340,4 +340,12 @@ public class InRecord {
     public void setRemark1(String remark1) {
         this.remark1 = remark1;
     }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
 }

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

@@ -87,6 +87,8 @@ public class OutRecord {
     private Integer inWareDays;
     private Double unitPrice;
     private String remark1; //垛位备注
+//    合约号
+    private String contractNo;
 
     public Double getUnitPrice() {
         return unitPrice;
@@ -446,4 +448,11 @@ public class OutRecord {
     public void setRemark1(String remark1) {
         this.remark1 = remark1;
     }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+    public String getContractNo() {
+        return contractNo;
+    }
 }

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

@@ -90,6 +90,7 @@ public class InServiceImpl implements InService {
         store.setInvoicePrice(prodPrice.getInvoicePrice());*/
 
         InRecord inRecord = getInRecord(store, "1", userId);
+        inRecord.setContractNo(store.getContractNo());
         num = inRecordMapper.insert(inRecord);
 
 
@@ -471,6 +472,7 @@ public class InServiceImpl implements InService {
         inRecord.setModel(store.getModel());
         inRecord.setCustomerName(store.getCustomer().getName());
         inRecord.setFkComponyName(store.getFkComponyId());
+        inRecord.setContractNo(store.getContractNo());
 
         if (recordType.equals("0")) {
             inRecord.setCount(-1 * store.getCount());

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

@@ -337,6 +337,7 @@ public class OutServiceImpl implements OutService {
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
         outRecord.setRemark1(store.getRemark1());
+        outRecord.setContractNo(store.getContractNo());
         InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
         /*double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
         Price price = priceMapper.selectByMaterialChangeTime(store.getFkComponyId(),store.getBelongId());

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

@@ -15,7 +15,7 @@
     <result column="count" property="count" jdbcType="DOUBLE" />
     <result column="weight" property="weight" jdbcType="DOUBLE" />
     <result column="remark" property="remark" jdbcType="VARCHAR" />
-
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />
     <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP" />
@@ -70,7 +70,7 @@
       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,remark1)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name,remark1,contract_no)
     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}, 
@@ -80,7 +80,7 @@
       #{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},#{remark1,jdbcType=VARCHAR})
+    ,#{ordNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR},#{remark1,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.InRecord" >
     insert into t_ware_in_record
@@ -151,6 +151,9 @@
       <if test="plateNo != null" >
         plate_no,
       </if>
+        <if test="contractNo != null" >
+            contract_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -219,6 +222,9 @@
       <if test="plateNo != null" >
         #{plateNo,jdbcType=VARCHAR},
       </if>
+        <if test="contractNo != null" >
+            #{contractNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.th.demo.model.ware.InRecord" >

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

@@ -91,6 +91,7 @@
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -124,7 +125,7 @@
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
     ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price
-    ,remark1)
+    ,remark1,contract_no)
     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}, 
@@ -135,7 +136,7 @@
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
     ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE}
-    ,#{remark1,jdbcType=VARCHAR})
+    ,#{remark1,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -470,7 +471,7 @@
     select
     e.name as fk_compony_name,p.tally_people as tally_people,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
     ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
-    ,t.invoice_price,t.distribution_id
+    ,t.invoice_price,t.distribution_id,t.contract_no
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
     ,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id