zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
bruce
71eab9f5 1 parent 1064b3a1

优化

Inline Side-by-side
Showing 3 changed files with 13 additions and 3 deletions
...@@ -114,6 +114,7 @@ public class PickPayBiz { ...@@ -114,6 +114,7 @@ public class PickPayBiz {
114 pickInfo.setClientId(info.getClientId()); 114 pickInfo.setClientId(info.getClientId());
115 pickInfo.setAmount(info.getAmount()); 115 pickInfo.setAmount(info.getAmount());
116 pickInfo.setTrusteeshipCycle(info.getTrusteeshipCycle()); 116 pickInfo.setTrusteeshipCycle(info.getTrusteeshipCycle());
117 + pickInfo.setBillNo(info.getTradeNo());
117 if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) { 118 if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) {
118 pickBiz.selfPickNew(pickInfo); 119 pickBiz.selfPickNew(pickInfo);
119 } else if ("2".equals(pickInfo.getPickType())) { 120 } else if ("2".equals(pickInfo.getPickType())) {
......
...@@ -43,6 +43,7 @@ public class OutpropApplyPickInfo extends BaseInfo { ...@@ -43,6 +43,7 @@ public class OutpropApplyPickInfo extends BaseInfo {
43 43
44 private String amount; 44 private String amount;
45 private Integer trusteeshipCycle; 45 private Integer trusteeshipCycle;
46 + private String billNo;
46 47
47 public String getPickNo() { 48 public String getPickNo() {
48 return pickNo; 49 return pickNo;
...@@ -267,4 +268,12 @@ public class OutpropApplyPickInfo extends BaseInfo { ...@@ -267,4 +268,12 @@ public class OutpropApplyPickInfo extends BaseInfo {
267 public void setTrusteeshipCycle(Integer trusteeshipCycle) { 268 public void setTrusteeshipCycle(Integer trusteeshipCycle) {
268 this.trusteeshipCycle = trusteeshipCycle; 269 this.trusteeshipCycle = trusteeshipCycle;
269 } 270 }
271 +
272 + public String getBillNo() {
273 + return billNo;
274 + }
275 +
276 + public void setBillNo(String billNo) {
277 + this.billNo = billNo;
278 + }
270 } 279 }
......
...@@ -7,19 +7,19 @@ ...@@ -7,19 +7,19 @@
7 <sql id="outpropapply_pick_field"> 7 <sql id="outpropapply_pick_field">
8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
10 - PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE 10 + PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE, BILL_NO
11 </sql> 11 </sql>
12 12
13 <insert id="save" parameterType="OutpropApplyPickInfo"> 13 <insert id="save" parameterType="OutpropApplyPickInfo">
14 INSERT INTO HS_ASSET.OUTPROPAPPLY_PICK (PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 14 INSERT INTO HS_ASSET.OUTPROPAPPLY_PICK (PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
15 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 15 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
16 - PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE) 16 + PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE, BILL_NO)
17 VALUES (#{pickNo}, #{clientId}, #{pickType}, #{pickAmount}, #{delegateName, jdbcType=VARCHAR}, #{delegateId, jdbcType=VARCHAR}, 17 VALUES (#{pickNo}, #{clientId}, #{pickType}, #{pickAmount}, #{delegateName, jdbcType=VARCHAR}, #{delegateId, jdbcType=VARCHAR},
18 #{zhaoonlineId, jdbcType=VARCHAR}, #{insurance}, '0', #{pickDate}, #{express, jdbcType=VARCHAR}, 18 #{zhaoonlineId, jdbcType=VARCHAR}, #{insurance}, '0', #{pickDate}, #{express, jdbcType=VARCHAR},
19 #{expressNo, jdbcType=VARCHAR}, #{createDate}, #{createTime}, 19 #{expressNo, jdbcType=VARCHAR}, #{createDate}, #{createTime},
20 #{packageType, jdbcType=VARCHAR}, #{packageFee, jdbcType=NUMERIC}, 20 #{packageType, jdbcType=VARCHAR}, #{packageFee, jdbcType=NUMERIC},
21 #{expressPackFee, jdbcType=NUMERIC}, #{amountFee, jdbcType=NUMERIC}, 21 #{expressPackFee, jdbcType=NUMERIC}, #{amountFee, jdbcType=NUMERIC},
22 - #{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC}) 22 + #{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC}, #{billNo, jdbcType=VARCHAR})
23 </insert> 23 </insert>
24 24
25 <!-- 合并提货单 --> 25 <!-- 合并提货单 -->
......