Browse Source

对接跨越下单,更新运单增加回单张数

xiaost 2 years ago
parent
commit
4cd192c074

+ 11 - 1
src/main/java/com/uas/eis/dto/OrderUpdateInfoDTO.java

@@ -21,7 +21,8 @@ public class OrderUpdateInfoDTO {
     private int count;    //件数
     private BigDecimal insuranceValue; //保价值
     private OrderCustomerInfo preWaybillDelivery ;//寄方
-    private OrderCustomerInfo preWaybillPickup ;//付方
+    private OrderCustomerInfo preWaybillPickup ;//付方、
+    private int receiptCount ;//回单张数
 
     public String getCustomerCode() {
         return customerCode;
@@ -103,4 +104,13 @@ public class OrderUpdateInfoDTO {
         this.preWaybillPickup = preWaybillPickup;
     }
 
+
+    public int getReceiptCount() {
+        return receiptCount;
+    }
+
+    public void setReceiptCount(int receiptCount) {
+        this.receiptCount = receiptCount;
+    }
+
 }

+ 2 - 1
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -200,7 +200,7 @@ public class ERPServiceImpl implements ERPService {
         SpObserver.putSp(master);
         SqlRowList rs = baseDao.queryForRowSet("select pi_inoutno,pi_title,PI_SERVICEMODE,PI_PAYMODE,PI_PAYMENTCUSTOMER,nvl(PI_IFRECEIPTFLAG,0) PI_IFRECEIPTFLAG," +
                 "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,SYSSENDKYE_,pi_listcode,nvl(pi_insuranceValue,0) pi_insuranceValue "+
-                " from prodinout left join employee on em_name=pi_recordman where pi_id=? and nvl(SYSSENDKYE_,0)<>0 and nvl(pi_listcode,' ')<>' ' ",id);
+                ",nvl(pi_receiptcount,1) pi_receiptcount from prodinout left join employee on em_name=pi_recordman where pi_id=? and nvl(SYSSENDKYE_,0)<>0 and nvl(pi_listcode,' ')<>' ' ",id);
         if(rs.next()) {
             logger.info("updateKyeOrder begin: master {} ,id {} ",master,id);
             Map<String,Object> map = new HashMap<>();
@@ -235,6 +235,7 @@ public class ERPServiceImpl implements ERPService {
             }else{
                 orderInfo.setReceiptFlag("10");
             }
+            orderInfo.setReceiptCount(rs.getGeneralInt("pi_receiptCount"));//回单张数
             boolean suc = true;
             String response = callWebserviceKYE("open.api.openCommon.updateYdByCondition", JSONArray.toJSONString(orderInfo));
             Map<Object, Object> res  = BaseUtil.parseFormStoreToMap(response);