Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java
#	hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java
#	hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java
#	hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -1,9 +1,7 @@
 package com.fjhx.sale.entity.contract.po;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -323,7 +321,6 @@ public class Contract extends BasePo {
      */
     private Integer versions;
 
-
     @TableField(exist = false)
     private Long upId;
 

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -84,7 +84,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
         //查询原合同
         Contract oldContract = contractService.getById(contract.getOldContractId());
-        if(ObjectUtil.isEmpty(oldContract)){
+        if (ObjectUtil.isEmpty(oldContract)) {
             throw new ServiceException("查询不到原合同信息");
         }
         //更新原样品单状态为变更中
@@ -92,12 +92,12 @@ public class ContractUpdateFlow extends FlowDelegate {
         contractService.updateById(oldContract);
         //查询旧合同的订单产品
         List<ContractProduct> oldContractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, oldContractId));
-        if(CollectionUtils.isEmpty(oldContractProductList)){
+        if (CollectionUtils.isEmpty(oldContractProductList)) {
             throw new ServiceException("原合同没有产品");
         }
-        Map<Long,List<ContractProduct>> oldContractProductMap = oldContractProductList.stream().collect(Collectors.groupingBy(ContractProduct::getId));
+        Map<Long, List<ContractProduct>> oldContractProductMap = oldContractProductList.stream().collect(Collectors.groupingBy(ContractProduct::getId));
         List<ContractProduct> newContractProductList = contract.getContractProductList();
-        if(CollectionUtils.isEmpty(newContractProductList)){
+        if (CollectionUtils.isEmpty(newContractProductList)) {
             throw new ServiceException("变更合同产品不能为空");
         }
         /**
@@ -115,9 +115,9 @@ public class ContractUpdateFlow extends FlowDelegate {
         /**
          * 计算新合同的剩余数量
          */
-        for(ContractProduct newCp:newContractProductList){
+        for (ContractProduct newCp : newContractProductList) {
             newCp.setExpendQuantity(newCp.getQuantity());
-            if(ObjectUtil.isNotEmpty(newCp.getId())){//如果新合同产品ID不为空
+            if (ObjectUtil.isNotEmpty(newCp.getId())) {//如果新合同产品ID不为空
                 //取出旧合同
                 ContractProduct oldContractProduct = oldContractProductMap.getOrDefault(newCp.getId(),null).get(0);
 //                //取出旧合同包装方式
@@ -140,8 +140,10 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
         return update(contract);
     }
+
     /**
      * 变更
+     *
      * @param contract
      * @return
      */
@@ -297,6 +299,7 @@ public class ContractUpdateFlow extends FlowDelegate {
 
     /**
      * 重新发起
+     *
      * @param flowId
      * @param businessId
      * @param flowStatus

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -96,6 +96,6 @@ public interface ContractMapper extends BaseMapper<Contract> {
      */
     List<AccountRunningWaterVo> getAccountRunningWaterByContractId(@Param("contractId") Long contractId);
 
-    List<ContractVo> getCustomerMoney();
     void updateContract(Contract contract);
+    List<ContractVo> getCustomerMoney();
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,7 +28,6 @@ import com.fjhx.sale.entity.documents.po.DocumentsTransport;
 import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailGoods;
-import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.mapper.documents.DocumentsMapper;
 import com.fjhx.sale.service.contract.ContractProjectService;
@@ -393,6 +391,8 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                     JSONObject object = new JSONObject();
                     // 项号
                     object.put("num", num);
+                    //产品id
+                    object.put("productId", product.getProductId());
                     // 商品编号(13位)原10位海关编码+3位检验检疫附加编码
                     object.put("customsCode", product.getCustomsCode());
                     // 商品名称

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -543,7 +543,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     /**
      * 改变库存数量
      */
-    private void changeStock(List<? extends InOutBo> list, Long warehouseId, JournalType journalType) {
+    private synchronized void changeStock(List<? extends InOutBo> list, Long warehouseId, JournalType journalType) {
 
         Map<Long, BigDecimal> map = list.stream().collect(Collectors.toMap(
                 InOutBo::getProductId,