经销库存、外贸库存正式合同：办事处内勤审核过程中可修改合同、驳回业务员可修改，办事处内勤审核通过生成订货单，后续节点驳回后只能修改规范性文件，其它不可再修改；经…

…销未锁规、外贸未锁规标准合同：办事处内勤审核过程中可修改合同、驳回业务员可修改，办事处内勤审核通过生成订货单，后续节点驳回后只能修改规范性文件

@@ -625,7 +625,7 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
     }
     }
 
 
-    @OpLog(type = OtherOpLogType.class, name = "上传合同附件，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "上传正式合同附件，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public void uploadFormalContract(UpdateContractDistributorStandardVo vo) {
     public void uploadFormalContract(UpdateContractDistributorStandardVo vo) {
@@ -635,6 +635,39 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
 
 
         LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
         LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getCode, vo.getCode())
+                .set(ContractDistributorStandard::getSupplier, vo.getSupplier())
+                .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
+                .set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
+                .set(vo.getRegion() != null, ContractDistributorStandard::getRegion, vo.getRegion())
+                .set(vo.getStockUpCompanyId() != null, ContractDistributorStandard::getStockUpCompanyId, vo.getStockUpCompanyId())
+                .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
+                .set(ContractDistributorStandard::getUnit, vo.getUnit())
+                .set(ContractDistributorStandard::getWorkshopId, vo.getWorkshopId())
+                .set(ContractDistributorStandard::getTotalAmountCapital, vo.getTotalAmountCapital())
+                .set(ContractDistributorStandard::getDepositInfo, vo.getDepositInfo())
+                .set(ContractDistributorStandard::getPackagingRequirements, vo.getPackagingRequirements())
+                .set(ContractDistributorStandard::getPaymentTerms, vo.getPaymentTerms())
+                .set(ContractDistributorStandard::getExecutionStandard, vo.getExecutionStandard())
+                .set(ContractDistributorStandard::getExecutionStandardRemarks, vo.getExecutionStandardRemarks())
+                .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
+                .set(ContractDistributorStandard::getDestination, vo.getDestination())
+                .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
+                .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
+                .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
+                .set(ContractDistributorStandard::getSurface, vo.getSurface())
+                .set(ContractDistributorStandard::getTolerance, vo.getTolerance())
+                .set(ContractDistributorStandard::getPerformance, vo.getPerformance())
+                .set(ContractDistributorStandard::getComponent, vo.getComponent())
+                .set(ContractDistributorStandard::getPackaging, vo.getPackaging())
+                .set(ContractDistributorStandard::getSpecialTerms, vo.getSpecialTerms())
+                .set(ContractDistributorStandard::getDesignatedConsignee, vo.getDesignatedConsignee())
+                .set(ContractDistributorStandard::getSpecialInstructions, vo.getSpecialInstructions())
+                .set(ContractDistributorStandard::getRemarks, vo.getRemarks())
+                .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax())
+                .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax())
+                .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
+                .set(ContractDistributorStandard::getType, vo.getType())
                 .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
                 .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
                 .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
                 .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
                 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
                 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
@@ -666,11 +699,28 @@ public class ContractDistributorStandardServiceImpl extends
         data.setFormalFileName(vo.getFormalFileName());
         data.setFormalFileName(vo.getFormalFileName());
         data.setFormalStandardized(vo.getFormalStandardized());
         data.setFormalStandardized(vo.getFormalStandardized());
 
 
+        //经销库存合同、外贸库存合同可以修改内容
+        if ("DIST_STOCK_CONTRACT".equals(data.getType()) || "INTL_INVENTORY_AGMT".equals(data.getType())) {
+            dealWithDistributorLine(data, vo);
+            //查询更新后数据
+            ContractDistributorStandard data1 = getBaseMapper().selectById(vo.getId());
+            Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
+                    .eq(PurchaseOrderInfo::getContractId, data.getId());
+            List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
+            Boolean canEdit = false;
+            if (CollectionUtils.isEmpty(purchaseOrderInfoList)) {
+                canEdit = true;
+            }
+            data1.setCanEdit(canEdit);
+        }
+
         // 开启审核
         // 开启审核
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
 
 
-        // 创建订货单
-        createPurchaseOrderInfo(data, Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(data.getType()) ? "PRODUCTION" : "NO_PRODUCTION");
+        // 创建订货单（经销未锁规、外贸未锁规上传正式合同附件直接生成订货单（无需生产））
+        if ("DRAFT_DIST_AGMT".equals(data.getType()) || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
+            createPurchaseOrderInfo(data, "NO_PRODUCTION");
+        }
     }
     }
 
 
     /**
     /**
@@ -864,22 +914,24 @@ public class ContractDistributorStandardServiceImpl extends
         data.setStandardFileId(vo.getStandardFileId());
         data.setStandardFileId(vo.getStandardFileId());
         data.setStandardFileName(vo.getStandardFileName());
         data.setStandardFileName(vo.getStandardFileName());
         data.setStandardStandardized(vo.getStandardStandardized());
         data.setStandardStandardized(vo.getStandardStandardized());
-        if ("PROCESS_STD_AGMT".equals(data.getType())) {
-            dealWithStdProcessingLine(data, vo);
-        } else {
-            dealWithDistributorLine(data, vo);
-        }
-
         //查询更新后数据
         //查询更新后数据
         ContractDistributorStandard data1 = getBaseMapper().selectById(vo.getId());
         ContractDistributorStandard data1 = getBaseMapper().selectById(vo.getId());
-        Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
-                .eq(PurchaseOrderInfo::getContractId, data.getId());
-        List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
-        Boolean canEdit = false;
-        if (CollectionUtils.isEmpty(purchaseOrderInfoList)) {
-            canEdit = true;
+        //经销库存合同、外贸库存合同上传标准合同附件时不可以修改内容
+        if (!"DIST_STOCK_CONTRACT".equals(data.getType()) && !"INTL_INVENTORY_AGMT".equals(data.getType())) {
+            if ("PROCESS_STD_AGMT".equals(data.getType())) {
+                dealWithStdProcessingLine(data, vo);
+            } else {
+                dealWithDistributorLine(data, vo);
+            }
+            Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
+                    .eq(PurchaseOrderInfo::getContractId, data.getId());
+            List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
+            Boolean canEdit = false;
+            if (CollectionUtils.isEmpty(purchaseOrderInfoList)) {
+                canEdit = true;
+            }
+            data1.setCanEdit(canEdit);
         }
         }
-        data1.setCanEdit(canEdit);
         // 开启审核
         // 开启审核
         flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data1);
         flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data1);
 
 
@@ -1254,8 +1306,8 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
-        // 创建订货单
-        createPurchaseOrderInfo(data, "PRODUCTION");
+//        // 创建订货单
+//        createPurchaseOrderInfo(data, "PRODUCTION");
     }
     }
 
 
     public List<String> getNoContractSigned(List<String> buyerList) {
     public List<String> getNoContractSigned(List<String> buyerList) {

@@ -90,13 +90,43 @@ public class FlowTaskServiceImpl implements FlowTaskService {
             //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
             //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
             String json = objectMapper.writeValueAsString(map);
             String json = objectMapper.writeValueAsString(map);
             UpdateContractDistributorStandardVo vo = JsonUtil.parseObject(json, UpdateContractDistributorStandardVo.class);
             UpdateContractDistributorStandardVo vo = JsonUtil.parseObject(json, UpdateContractDistributorStandardVo.class);
-            contractDistributorStandardService.update(vo);
-            if ("PASS".equals(status) && ("DISTRIB_STD".equals(vo.getType())
+            //经销标准合同、外贸标准合同、加工标准合同、经销未锁规合同、外贸未锁规格合同
+            if ("DISTRIB_STD".equals(vo.getType())
                     || "INTL_STD_CONTRACT".equals(vo.getType())
                     || "INTL_STD_CONTRACT".equals(vo.getType())
-                    || "PROCESS_STD_AGMT".equals(vo.getType()))) {
-                ContractDistributorStandard data = contractDistributorStandardService.findById(vo.getId());
-                // 创建订货单
-                contractDistributorStandardService.createPurchaseOrderInfo(data, "PRODUCTION");
+                    || "PROCESS_STD_AGMT".equals(vo.getType())
+                    || "DRAFT_DIST_AGMT".equals(vo.getType())
+                    || "INTL_OPEN_SPEC_AGMT".equals(vo.getType())) {
+                contractDistributorStandardService.update(vo);
+                if ("PASS".equals(status)) {
+                    ContractDistributorStandard data = contractDistributorStandardService.findById(vo.getId());
+                    // 创建订货单
+                    contractDistributorStandardService.createPurchaseOrderInfo(data, "PRODUCTION");
+                }
+            }
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改正式合同，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateFormalContractByMap(Map<String, Object> map, String status) {
+        try {
+            // 创建 ObjectMapper 实例
+            ObjectMapper objectMapper = new ObjectMapper();
+            //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
+            String json = objectMapper.writeValueAsString(map);
+            UpdateContractDistributorStandardVo vo = JsonUtil.parseObject(json, UpdateContractDistributorStandardVo.class);
+            //经销库存合同、外贸库存合同
+            if ("DIST_STOCK_CONTRACT".equals(vo.getType())
+                    || "INTL_INVENTORY_AGMT".equals(vo.getType())) {
+                contractDistributorStandardService.update(vo);
+                if ("PASS".equals(status)) {
+                    ContractDistributorStandard data = contractDistributorStandardService.findById(vo.getId());
+                    // 创建订货单
+                    contractDistributorStandardService.createPurchaseOrderInfo(data, "PRODUCTION");
+                }
             }
             }
         } catch (JsonProcessingException e) {
         } catch (JsonProcessingException e) {
             e.printStackTrace();
             e.printStackTrace();