Browse Source

调整成正式环境

xiaost 2 years ago
parent
commit
66e9ba7b17

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

@@ -3,6 +3,8 @@ package com.uas.eis.dto;
 import com.kyexpress.openapi.bo.request.batchorder.OrderCustomerInfo;
 import com.kyexpress.openapi.bo.request.batchorder.OrderCustomerInfo;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
+
 /**
 /**
  * @author xiaost
  * @author xiaost
  * @date 2023/8/30 10:54
  * @date 2023/8/30 10:54
@@ -17,6 +19,7 @@ public class OrderUpdateInfoDTO {
     private String serviceMode ;//服务方式
     private String serviceMode ;//服务方式
     private String receiptFlag ;//是否签回单
     private String receiptFlag ;//是否签回单
     private int count;    //件数
     private int count;    //件数
+    private BigDecimal insuranceValue; //保价值
     private OrderCustomerInfo preWaybillDelivery ;//寄方
     private OrderCustomerInfo preWaybillDelivery ;//寄方
     private OrderCustomerInfo preWaybillPickup ;//付方
     private OrderCustomerInfo preWaybillPickup ;//付方
 
 
@@ -76,6 +79,14 @@ public class OrderUpdateInfoDTO {
         this.receiptFlag = receiptFlag;
         this.receiptFlag = receiptFlag;
     }
     }
 
 
+    public BigDecimal getInsuranceValue() {
+        return insuranceValue;
+    }
+
+    public void setInsuranceValue(BigDecimal insuranceValue) {
+        this.insuranceValue = insuranceValue;
+    }
+
     public OrderCustomerInfo getPreWaybillDelivery() {
     public OrderCustomerInfo getPreWaybillDelivery() {
         return preWaybillDelivery;
         return preWaybillDelivery;
     }
     }

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

@@ -50,7 +50,7 @@ public class ERPServiceImpl implements ERPService {
     public Map<String, Object> pushKyeOrder(String master, Integer id) throws IOException {
     public Map<String, Object> pushKyeOrder(String master, Integer id) throws IOException {
         SpObserver.putSp(master);
         SpObserver.putSp(master);
         SqlRowList rs = baseDao.queryForRowSet("select pi_inoutno,pi_title,PI_SERVICEMODE,PI_PAYMODE,PI_PAYMENTCUSTOMER,nvl(PI_IFRECEIPTFLAG,0) PI_IFRECEIPTFLAG," +
         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,nvl(pi_receiptcount,1) pi_receiptcount,PI_KYEREMAKR,SYSSENDKYE_"+
+                "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,nvl(pi_receiptcount,1) pi_receiptcount,PI_KYEREMAKR,SYSSENDKYE_,nvl(pi_insuranceValue,0) pi_insuranceValue"+
                 " from prodinout left join employee on em_name=pi_recordman where pi_id=?",id);
                 " from prodinout left join employee on em_name=pi_recordman where pi_id=?",id);
         if(rs.next()) {
         if(rs.next()) {
             Map<String,Object> map = new HashMap<>();
             Map<String,Object> map = new HashMap<>();
@@ -134,6 +134,9 @@ public class ERPServiceImpl implements ERPService {
             }else{
             }else{
                 orderInfoItem.setReceiptFlag("10");
                 orderInfoItem.setReceiptFlag("10");
             }
             }
+            //保价值
+            orderInfoItem.setInsuranceValue(rs.getGeneralBigDecimal("pi_insuranceValue"));
+
             //回单张数
             //回单张数
             orderInfoItem.setReceiptCount(rs.getGeneralInt("pi_receiptCount")); //默认值为1
             orderInfoItem.setReceiptCount(rs.getGeneralInt("pi_receiptCount")); //默认值为1
             orderInfoItem.setWaybillRemark(rs.getString("pi_kyeremakr"));// 备注:PI_KYEREMAKR
             orderInfoItem.setWaybillRemark(rs.getString("pi_kyeremakr"));// 备注:PI_KYEREMAKR
@@ -194,7 +197,7 @@ public class ERPServiceImpl implements ERPService {
     public Map<String, Object> updateKyeOrder(String master, int id) throws IOException {
     public Map<String, Object> updateKyeOrder(String master, int id) throws IOException {
         SpObserver.putSp(master);
         SpObserver.putSp(master);
         SqlRowList rs = baseDao.queryForRowSet("select pi_inoutno,pi_title,PI_SERVICEMODE,PI_PAYMODE,PI_PAYMENTCUSTOMER,nvl(PI_IFRECEIPTFLAG,0) PI_IFRECEIPTFLAG," +
         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_logisticscode "+
+                "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,SYSSENDKYE_,pi_logisticscode,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_logisticscode,' ')<>' ' ",id);
                 " from prodinout left join employee on em_name=pi_recordman where pi_id=? and nvl(SYSSENDKYE_,0)<>0 and nvl(pi_logisticscode,' ')<>' ' ",id);
         if(rs.next()) {
         if(rs.next()) {
             logger.info("updateKyeOrder begin: master {} ,id {} ",master,id);
             logger.info("updateKyeOrder begin: master {} ,id {} ",master,id);
@@ -205,6 +208,8 @@ public class ERPServiceImpl implements ERPService {
             orderInfo.setPlatformFlag(kyeConfig.getPlatformFlag());//固定值
             orderInfo.setPlatformFlag(kyeConfig.getPlatformFlag());//固定值
             orderInfo.setWaybillNumber(rs.getString("pi_logisticscode"));
             orderInfo.setWaybillNumber(rs.getString("pi_logisticscode"));
             orderInfo.setType("20"); //为空默认为10,10-修改订单和运单数据 、20-只修改运单数据
             orderInfo.setType("20"); //为空默认为10,10-修改订单和运单数据 、20-只修改运单数据
+            //保价值
+            orderInfo.setInsuranceValue(rs.getGeneralBigDecimal("pi_insuranceValue"));
             //设置寄件方
             //设置寄件方
             OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
             OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
             preWaybillDelivery.setCompanyName("深圳华商龙");  //固定值
             preWaybillDelivery.setCompanyName("深圳华商龙");  //固定值