提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/contract/service/impl/ContractFlowServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.contract.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.activiti.ProcessTaskReferBuilder;
 import com.fjhx.activiti.ProcessTaskResult;
@@ -19,12 +20,7 @@ import com.fjhx.contract.entity.ContractProject;
 import com.fjhx.contract.enums.ContractSourceEnum;
 import com.fjhx.contract.enums.ContractStatusEnum;
 import com.fjhx.contract.enums.ContractTrackTypeEnum;
-import com.fjhx.contract.service.IContractFlowService;
-import com.fjhx.contract.service.IContractPdfService;
-import com.fjhx.contract.service.IContractProductService;
-import com.fjhx.contract.service.IContractProjectService;
-import com.fjhx.contract.service.IContractService;
-import com.fjhx.contract.service.IContractTrackLogService;
+import com.fjhx.contract.service.*;
 import com.fjhx.message.constant.MessageNoticeConstant;
 import com.fjhx.message.enums.MessageNoticeEnum;
 import com.fjhx.message.service.IMessageNoticeService;
@@ -44,7 +40,6 @@ import org.springblade.core.redis.lock.RedisLockClient;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Try;
 import org.springblade.core.tool.utils.id.IdUtils;
 import org.springblade.resource.entity.Base64ToUrl;
 import org.springblade.resource.feign.IObsClient;
@@ -55,12 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * 外销合同 - 流程
@@ -616,7 +606,7 @@ public class ContractFlowServiceImpl implements IContractFlowService {
     private void saveBatchContractProject(Contract contract) {
         if (CollectionUtils.isNotEmpty(contract.getProjects())) {
             for (ContractProject project : contract.getProjects()) {
-                project.setId(IdUtils.fastSimpleUUID());
+                project.setId(IdWorker.getIdStr());
                 project.setContractId(contract.getId());
             }
             contractProjectService.saveBatch(contract.getProjects());
@@ -631,15 +621,17 @@ public class ContractFlowServiceImpl implements IContractFlowService {
      */
     private void saveBatchShipmentDetailed(Contract contract, Map<String, String> shipmentProductIdMap) {
         if (CollectionUtils.isNotEmpty(contract.getShipments())) {
+            int i = 1;
             //通过行号匹配出对应的合同产品主键id，key=行号，value=合同产品id
             for (ShipmentDetailed shipment : contract.getShipments()) {
-                shipment.setId(IdUtils.fastSimpleUUID());
+                shipment.setId(IdWorker.getIdStr());
                 //合同id
                 shipment.setBusinessId(contract.getId());
 
                 //根据行号获取出合同产品id
                 String productId = shipmentProductIdMap.get(shipment.getRowId());
                 shipment.setProductId(productId);
+                shipment.setSort(i++);
             }
             shipmentDetailedService.saveBatch(contract.getShipments());
         }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -18,6 +18,7 @@ package com.fjhx.purchase.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.claim.entity.Claim;
 import com.fjhx.claim.service.IClaimService;
@@ -79,14 +80,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -355,7 +349,7 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
                 }
 
                 // 此处ID重新赋值，是防止复制采购合同时把复制对象的ID携带过来
-                product.setId(IdUtils.fastSimpleUUID());
+                product.setId(IdWorker.getIdStr());
                 product.setPurchaseContractId(purchaseContract.getId());
                 product.setManufactureStatus(ManufactureStatusEnum.NOT_PRODUCED.getKey());
                 // 记录行号ID与采购合同产品ID的关联map
@@ -377,7 +371,7 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
         if (CollectionUtils.isNotEmpty(purchaseContract.getProjects())) {
             for (PurchaseContractProject project : purchaseContract.getProjects()) {
                 // 此处ID设为null，是防止复制采购合同时把复制对象的ID携带过来
-                project.setId(null);
+                project.setId(IdWorker.getIdStr());
                 project.setPurchaseContractId(purchaseContract.getId());
             }
             iPurchaseContractProjectService.saveBatch(purchaseContract.getProjects());
@@ -386,7 +380,7 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
         if (CollectionUtils.isNotEmpty(purchaseContract.getShipments())) {
             for (ShipmentDetailed shipment : purchaseContract.getShipments()) {
                 // 此处ID设为null，是防止复制采购合同时把复制对象的ID携带过来
-                shipment.setId(null);
+                shipment.setId(IdWorker.getIdStr());
                 shipment.setBusinessId(purchaseContract.getId());
                 // 赋值采购合同产品ID
                 shipment.setProductId(rowIdsMap.get(shipment.getRowId()));