问题处理

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchase.java

@@ -246,6 +246,11 @@ public class EhsdPurchase extends BasePo {
     private Long oldPurchaseId;
 
     /**
+     * 卖方邮编
+     */
+    private String sellPostalCode;
+
+    /**
      * 采购到货列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/entity/sample/po/Sample.java

@@ -261,6 +261,11 @@ public class Sample extends BasePo {
     private String isChange;
 
     /**
+     * 卖方邮编
+     */
+    private String sellPostalCode;
+
+    /**
      * 交接单附件列表
      */
     @TableField(exist = false)

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

@@ -134,7 +134,8 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 
 
         purchase.setStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
-        purchase.setUserName(SecurityUtils.getUsername());
+        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+        purchase.setUserName(nickName);
         purchaseService.save(purchase);
         List<EhsdPurchaseProduct> purchaseProductList = purchase.getPurchaseProductList();
         List<EhsdPurchaseProject> purchaseProjectList = purchase.getPurchaseProjectList();

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

@@ -3,6 +3,7 @@ package com.fjhx.sale.flow;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
@@ -113,6 +114,11 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
         EhsdPurchase purchase = ehsdPurchaseService.getById(businessId);
         Assert.notEmpty(purchase, "采购单不存在,或已被删除");
 
+        //作废旧合同
+        EhsdPurchase oldEhsdPurchase = ehsdPurchaseService.getById(purchase.getOldPurchaseId());
+        oldEhsdPurchase.setStatus(FlowStatusEnum1.CANCELLATION.getKey());
+        ehsdPurchaseService.updateById(oldEhsdPurchase);
+
         //回滚旧合同的已采购数量
         List<EhsdPurchaseProduct> oldPurchaseProductList = ehsdPurchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getPurchaseId, purchase.getOldPurchaseId()));
         for (EhsdPurchaseProduct ehsdPurchaseProduct : oldPurchaseProductList) {
@@ -138,16 +144,17 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
 
         //先将当前合同id 以及 当前合同关联数据的合同id 改为临时id
         long tempId = IdWorker.getId();
-        ehsdPurchaseService.update(q -> q.eq(BaseIdPo::getId, businessId).set(BaseIdPo::getId, tempId));
+//        ehsdPurchaseService.update(q -> q.eq(BaseIdPo::getId, businessId).set(BaseIdPo::getId, tempId));
+        ehsdPurchaseService.updatePurchaseId(businessId,tempId,SecurityUtils.getUserId());
         ehsdPurchaseProductService.update(q -> q.eq(EhsdPurchaseProduct::getPurchaseId, businessId).set(EhsdPurchaseProduct::getPurchaseId, tempId));
         ehsdPurchaseProjectService.update(q -> q.eq(EhsdPurchaseProject::getPurchaseId, businessId).set(EhsdPurchaseProject::getPurchaseId, tempId));
         ehsdPurchaseArrivalService.update(q -> q.eq(EhsdPurchaseArrival::getPurchaseId, businessId).set(EhsdPurchaseArrival::getPurchaseId, tempId));
 
 
         //将旧合同的id改为新合同id
+        ehsdPurchaseService.updatePurchaseId(oldPurchaseId,businessId,SecurityUtils.getUserId());
         ehsdPurchaseService.update(q -> q
                 .eq(BaseIdPo::getId, oldPurchaseId)
-                .set(BaseIdPo::getId, businessId)
                 .set(EhsdPurchase::getOldPurchaseId, oldPurchaseId)
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
@@ -171,9 +178,9 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
         //将新合同id改为旧合同id
+        ehsdPurchaseService.updatePurchaseId(tempId,oldPurchaseId,SecurityUtils.getUserId());
         ehsdPurchaseService.update(q -> q
                 .eq(BaseIdPo::getId, tempId)
-                .set(BaseIdPo::getId, oldPurchaseId)
                 .set(EhsdPurchase::getOldPurchaseId, businessId)
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseMapper.java

@@ -23,4 +23,5 @@ public interface EhsdPurchaseMapper extends BaseMapper<EhsdPurchase> {
      */
     Page<EhsdPurchaseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchase> wrapper);
 
+    boolean updatePurchaseId(Long id, long newId, Long userId);
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseProductMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * ehsd采购产品表 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-17
  */
 public interface EhsdPurchaseProductMapper extends BaseMapper<EhsdPurchaseProduct> {
@@ -40,4 +40,6 @@ public interface EhsdPurchaseProductMapper extends BaseMapper<EhsdPurchaseProduc
      * @return
      */
     List<EhsdPurchaseProductVo> getListByContractId(Long contractId);
+
+    boolean updatePurchaseId(@Param("id")Long id ,@Param("newId")Long newId,@Param("userId")Long userId);
 }

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseService.java

@@ -49,4 +49,6 @@ public interface EhsdPurchaseService extends BaseService<EhsdPurchase> {
      * 根据供应商查询无发票的采购合同
      */
     List<EhsdPurchaseVo> getListBySupplyId(String supplyId);
+
+    boolean updatePurchaseId(Long businessId, long tempId, Long userId);
 }

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -44,6 +44,7 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -125,6 +126,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         Map<Long, BigDecimal> payMap = payDetailVoList.stream().collect(Collectors.toMap(PayDetailVo::getPurchaseId, PayDetailVo::getSumMoney));
         records.forEach(item->item.setSumPayMoney(payMap.getOrDefault(item.getId(),BigDecimal.ZERO)));
 
+        //赋值用户名称
+        UserUtil.assignmentNickName(records,EhsdPurchase::getCreateUser,EhsdPurchase::setUserName);
+
         return page;
     }
 
@@ -291,4 +295,12 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         return page;
     }
 
+    /**
+     * 采购id修改
+     */
+    @Override
+    public boolean updatePurchaseId(Long id, long newId, Long userId) {
+        return baseMapper.updatePurchaseId(id,newId,userId);
+    }
+
 }

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseMapper.xml

@@ -11,4 +11,9 @@
             ${ew.customSqlSegment}
     </select>
 
+    <update id="updatePurchaseId">
+        update ehsd_purchase set id = #{newId},update_user = #{userId},update_time = sysdate() where id = #{id}
+    </update>
+
+
 </mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.purchase.EhsdPurchaseProductMapper">
+    <update id="updatePurchaseId"></update>
     <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo">
         select
             epp.id,