物料上传BUG修复

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/ProdStorageDTO.java

@@ -17,6 +17,10 @@ public class ProdStorageDTO implements Serializable {
     private String prodBrand;
     private String prodUnit;
     private String prodLeadtime;
+    /**
+     * 上传状态
+     */
+    private String b2bStatus;
     /**
      * 绑定状态
      */
@@ -86,6 +90,14 @@ public class ProdStorageDTO implements Serializable {
         this.prodLeadtime = prodLeadtime;
     }
 
+    public String getB2bStatus() {
+        return b2bStatus;
+    }
+
+    public void setB2bStatus(String b2bStatus) {
+        this.b2bStatus = b2bStatus;
+    }
+
     public Short getStatus() {
         return status;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -167,6 +167,11 @@ public class ProductController {
         return Result.success(productService.getProdStorage(page, listReqDTO));
     }
 
+    /**
+     * 上传个人物料库
+     * @param productSalerDTO
+     * @return
+     */
     @PostMapping("/prodStorage/saler")
     public Result createProdSaler(@RequestBody ProductSalerDTO productSalerDTO){
         productService.createProdSaler(productSalerDTO);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -802,13 +802,15 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         ProductSalerUploadDTO productSalerUploadDTO = new ProductSalerUploadDTO(productSalerDTO.getProdId(), productSalerDTO.getProdCode(), enUU, userUU);
+        List<ProductSalerDTO> productSalerDTOList = new ArrayList<ProductSalerDTO>();
+        productSalerDTOList.add(productSalerDTO);
         if (productSalerDTO.getOperate() == 0){
             //解绑
-            publicProductApi.uploadProductSalerForCancel(JsonUtils.toJsonString(productSalerDTO));
+            publicProductApi.uploadProductSalerForCancel(JsonUtils.toJsonString(productSalerDTOList));
             productSalerMapper.unbind(productSalerDTO.getProdId(), BaseContextHolder.getUserId(), BaseContextHolder.getCompanyId());
         }else if (productSalerDTO.getOperate() == 1){
             //绑定
-            publicProductApi.updateProdSaler(JsonUtils.toJsonString(productSalerDTO));
+            publicProductApi.updateProdSaler(JsonUtils.toJsonString(productSalerDTOList));
             productSalerMapper.bind(productSalerDTO.getProdId(), BaseContextHolder.getUserId(), BaseContextHolder.getCompanyId());
         }
     }