111

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

@@ -86,6 +86,9 @@ public class OutRecord {
     private Double storeFee;
     private Integer inWareDays;
 
+    private String contractNo;
+    private String packNo;
+
     public Double getStoreFee() {
         return storeFee;
     }
@@ -428,4 +431,20 @@ public class OutRecord {
     public void setProductionPlace(String productionPlace) {
         this.productionPlace = productionPlace;
     }
+
+    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;
+    }
 }

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

@@ -285,6 +285,15 @@ public class OutServiceImpl implements OutService {
             outRecord.setCount(store.getCount());
             outRecord.setWeight(store.getWeight());
         }
+        if (recordType.equals("0")) {
+            outRecord.setCancelFlag("9");
+        } else {
+            outRecord.setCancelFlag("0");
+        }
+
+        outRecord.setPackNo(store.getPackNo());
+        outRecord.setContractNo(store.getContractNo());
+
         outRecord.setRemark(store.getRemark());
         outRecord.setBelongId(store.getBelongId());
         outRecord.setPlateNo(store.getPlateNo());
@@ -294,7 +303,8 @@ public class OutServiceImpl implements OutService {
         outRecord.setRecordType(recordType);
         outRecord.setReceiveAddress(store.getReceiveAddress());
         outRecord.setDistributionId(distributionId);
-        outRecord.setCancelFlag("0");
+
+
         outRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());

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

@@ -43,6 +43,9 @@
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
 
+    <result column="pack_no" property="packNo" jdbcType="VARCHAR" />
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
+
     <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
     <association  column="distribution_id" property="distribution" select="com.th.demo.mapping.ware.DistributionMapper.selectByPrimaryKey" />
   </resultMap>
@@ -88,6 +91,8 @@
     <result column="distribution_id" property="distributionId" jdbcType="VARCHAR" />
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
+    <result column="pack_no" property="packNo" jdbcType="VARCHAR" />
+    <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" />
@@ -95,7 +100,7 @@
   </resultMap>
   <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, 
+    customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, pack_no,contract_no,
     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,verify_account_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -120,7 +125,7 @@
       modify_id, modify_time, cancel_id, 
       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)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,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}, 
@@ -130,7 +135,8 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{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})
+    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},
+    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -367,7 +373,9 @@
            record_type = #{recordType,jdbcType=VARCHAR},
           back_flag =  #{backFlag,jdbcType=VARCHAR},
     receive_address = #{receiveAddress,jdbcType=VARCHAR},
-      distribution_id =  #{distributionId,jdbcType=VARCHAR}
+      distribution_id =  #{distributionId,jdbcType=VARCHAR},
+        pack_no = #{packNo,jdbcType=VARCHAR},
+        contract_no =  #{contractNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>