采购单结案/反结案、验收/验退上传BUG修改

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseEndTask.java

@@ -47,7 +47,7 @@ public class SendPurchaseEndTask extends Executable {
         PurchaseFormDTO purchaseFormDTO = purchaseApi.getFormData(Long.parseLong(messageInfo.getBizId())).getData();
         short endStatus = 0;
         //结案、反结案
-        if("CLOSE".equals(purchaseFormDTO.getMain().getPu_statuscode())) {
+        if("CLOSE".equals(purchaseFormDTO.getMain().getPu_acceptstatuscode())) {
             endStatus = 1;     //结案
         } else {
             endStatus = 0;     //反结案

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseInResTask.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.transfers.task;
 import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.document.api.VendorApi;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOutDetail;
 import com.usoftchina.saas.purchase.api.ProdInOutApi;
@@ -14,6 +15,7 @@ import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,8 @@ public class SendPurchaseInResTask extends Executable {
     @Autowired
     private ProdInOutApi prodInOutApi;
     @Autowired
+    private VendorApi vendorApi;
+    @Autowired
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
@@ -75,6 +79,8 @@ public class SendPurchaseInResTask extends Executable {
         b2bPurchaseProdInOut.setPi_rate(new BigDecimal(prodInOutDTO.getPi_rate()).floatValue());
         b2bPurchaseProdInOut.setPi_inoutman(prodInOutDTO.getPi_auditman());
         b2bPurchaseProdInOut.setPi_id(prodInOutDTO.getId());
+        String vendorUU = vendorApi.getDataById(ObjectUtils.getLongValue(prodInOutDTO.getPi_vendid())).getData().getMain().getVe_uu();
+        b2bPurchaseProdInOut.setPi_vendoruu(Long.parseLong(vendorUU));
     }
 
     private void convertToPronInOutDetail(List<ProdIODetailDTO> items, List<PurchaseProdInOutDetail> b2bPurchaseProdInOutDetailList){
@@ -83,6 +89,7 @@ public class SendPurchaseInResTask extends Executable {
             PurchaseProdInOutDetail b2bPurchaseProdInOutDetail = b2bPurchaseProdInOutDetailList.get(i);
             b2bPurchaseProdInOutDetail.setPd_id(prodIODetailDTO.getId());
             b2bPurchaseProdInOutDetail.setPd_detno(new BigDecimal(prodIODetailDTO.getPd_pdno()).shortValue());
+            b2bPurchaseProdInOutDetail.setPd_orderdetno(new BigDecimal(prodIODetailDTO.getPd_orderdetno()).shortValue());
         }
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseInTask.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.document.api.VendorApi;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOutDetail;
 import com.usoftchina.saas.purchase.api.ProdInOutApi;
@@ -16,6 +17,7 @@ import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import com.usoftchina.saas.utils.http.HttpUtil;
 import com.usoftchina.saas.utils.http.HttpUtil.Response;
 import org.slf4j.Logger;
@@ -44,6 +46,8 @@ public class SendPurchaseInTask extends Executable{
     @Autowired
     private ProdInOutApi prodInOutApi;
     @Autowired
+    private VendorApi vendorApi;
+    @Autowired
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
@@ -83,6 +87,8 @@ public class SendPurchaseInTask extends Executable{
         b2bPurchaseProdInOut.setPi_rate(new BigDecimal(prodInOutDTO.getPi_rate()).floatValue());
         b2bPurchaseProdInOut.setPi_inoutman(prodInOutDTO.getPi_auditman());
         b2bPurchaseProdInOut.setPi_id(prodInOutDTO.getId());
+        String vendorUU = vendorApi.getDataById(ObjectUtils.getLongValue(prodInOutDTO.getPi_vendid())).getData().getMain().getVe_uu();
+        b2bPurchaseProdInOut.setPi_vendoruu(Long.parseLong(vendorUU));
     }
 
     private void convertToPronInOutDetail(List<ProdIODetailDTO> items, List<PurchaseProdInOutDetail> b2bPurchaseProdInOutDetailList){
@@ -91,6 +97,7 @@ public class SendPurchaseInTask extends Executable{
             PurchaseProdInOutDetail b2bPurchaseProdInOutDetail = b2bPurchaseProdInOutDetailList.get(i);
             b2bPurchaseProdInOutDetail.setPd_id(prodIODetailDTO.getId());
             b2bPurchaseProdInOutDetail.setPd_detno(new BigDecimal(prodIODetailDTO.getPd_pdno()).shortValue());
+            b2bPurchaseProdInOutDetail.setPd_orderdetno(new BigDecimal(prodIODetailDTO.getPd_orderdetno()).shortValue());
         }
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseOutResTask.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.transfers.task;
 import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.document.api.VendorApi;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOutDetail;
 import com.usoftchina.saas.purchase.api.ProdInOutApi;
@@ -14,6 +15,7 @@ import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,8 @@ public class SendPurchaseOutResTask extends Executable {
     @Autowired
     private ProdInOutApi prodInOutApi;
     @Autowired
+    private VendorApi vendorApi;
+    @Autowired
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
@@ -75,6 +79,8 @@ public class SendPurchaseOutResTask extends Executable {
         b2bPurchaseProdInOut.setPi_rate(new BigDecimal(prodInOutDTO.getPi_rate()).floatValue());
         b2bPurchaseProdInOut.setPi_inoutman(prodInOutDTO.getPi_auditman());
         b2bPurchaseProdInOut.setPi_id(prodInOutDTO.getId());
+        String vendorUU = vendorApi.getDataById(ObjectUtils.getLongValue(prodInOutDTO.getPi_vendid())).getData().getMain().getVe_uu();
+        b2bPurchaseProdInOut.setPi_vendoruu(Long.parseLong(vendorUU));
     }
 
     private void convertToPronInOutDetail(List<ProdIODetailDTO> items, List<PurchaseProdInOutDetail> b2bPurchaseProdInOutDetailList){
@@ -83,6 +89,7 @@ public class SendPurchaseOutResTask extends Executable {
             PurchaseProdInOutDetail b2bPurchaseProdInOutDetail = b2bPurchaseProdInOutDetailList.get(i);
             b2bPurchaseProdInOutDetail.setPd_id(prodIODetailDTO.getId());
             b2bPurchaseProdInOutDetail.setPd_detno(new BigDecimal(prodIODetailDTO.getPd_pdno()).shortValue());
+            b2bPurchaseProdInOutDetail.setPd_orderdetno(new BigDecimal(prodIODetailDTO.getPd_orderdetno()).shortValue());
         }
     }
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseOutTask.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.transfers.task;
 import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.document.api.VendorApi;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOutDetail;
 import com.usoftchina.saas.purchase.api.ProdInOutApi;
@@ -14,6 +15,7 @@ import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,8 @@ public class SendPurchaseOutTask extends Executable{
     @Autowired
     private ProdInOutApi prodInOutApi;
     @Autowired
+    private VendorApi vendorApi;
+    @Autowired
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
@@ -79,6 +83,8 @@ public class SendPurchaseOutTask extends Executable{
         b2bPurchaseProdInOut.setPi_rate(new BigDecimal(prodInOutDTO.getPi_rate()).floatValue());
         b2bPurchaseProdInOut.setPi_inoutman(prodInOutDTO.getPi_auditman());
         b2bPurchaseProdInOut.setPi_id(prodInOutDTO.getId());
+        String vendorUU = vendorApi.getDataById(ObjectUtils.getLongValue(prodInOutDTO.getPi_vendid())).getData().getMain().getVe_uu();
+        b2bPurchaseProdInOut.setPi_vendoruu(Long.parseLong(vendorUU));
     }
 
     private void convertToPronInOutDetail(List<ProdIODetailDTO> items, List<PurchaseProdInOutDetail> b2bPurchaseProdInOutDetailList){
@@ -87,6 +93,7 @@ public class SendPurchaseOutTask extends Executable{
             PurchaseProdInOutDetail b2bPurchaseProdInOutDetail = b2bPurchaseProdInOutDetailList.get(i);
             b2bPurchaseProdInOutDetail.setPd_id(prodIODetailDTO.getId());
             b2bPurchaseProdInOutDetail.setPd_detno(new BigDecimal(prodIODetailDTO.getPd_pdno()).shortValue());
+            b2bPurchaseProdInOutDetail.setPd_orderdetno(new BigDecimal(prodIODetailDTO.getPd_orderdetno()).shortValue());
         }
     }
 }