楚江ERP-订货单规格变更逻辑调整

@@ -14,23 +14,16 @@ import java.util.List;
 @Slf4j
 @Slf4j
 public class MessageHandler {
 public class MessageHandler {
 
 
-    @Resource
-    private SysUserDeptService userDeptService;
-    @Resource
-    private SysUserRoleMapper sysUserRoleMapper;
-    @Resource
-    private WorkshopService workshopService;
-
 
 
     /**
     /**
-     * 根据角色code获取办理人
+     * 消息通知
      *
      *
-     * @param roleCode  角色编号
-     * @param userId    业务数据创建人/更新人ID
+     * @param roleCodes 角色编号集合
+     * @param userId    人员ID
      * @return          List<String>
      * @return          List<String>
      */
      */
-    public List<String> sendMsg(String userId, List<String> roleCode) {
-        log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCode:{}", userId, JsonUtil.toJsonString(roleCode));
+    public List<String> sendMsg(String userId, List<String> roleCodes) {
+        log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCodes:{}", userId, JsonUtil.toJsonString(roleCodes));
 
 
         return null;
         return null;
     }
     }

@@ -18,6 +18,7 @@ import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -85,13 +86,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         }
         }
         // 获取规格数据
         // 获取规格数据
         // 变更前
         // 变更前
-        String redisKey = changeRecord.getOrderId() + "_order_line_info";
-        long size = redisHandler.lGetListSize(redisKey);
-        List<Object> objectList = redisHandler.lGet(redisKey, 0, size);
-        List<PurchaseOrderLine> beforeChangeList = objectList.stream()
-                .filter(PurchaseOrderLine.class::isInstance)
-                .map(PurchaseOrderLine.class::cast)
-                .collect(Collectors.toList());
+        Object obj = redisHandler.get(changeRecord.getOrderId() + "_order_line_info");
+        List<PurchaseOrderLine> beforeChangeList = JsonUtil.parseList(obj.toString(), PurchaseOrderLine.class);
         changeRecord.setBeforeChangeSpecList(beforeChangeList);
         changeRecord.setBeforeChangeSpecList(beforeChangeList);
         // 变更后
         // 变更后
         List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id));
         List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id));
@@ -181,8 +177,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
             purchaseOrderLineService.create(orderLineVo);
             purchaseOrderLineService.create(orderLineVo);
         }
         }
         // 缓存订货单物料行数据
         // 缓存订货单物料行数据
-        String redisKey = vo.getOrderId() + "_order_line_info";
-        redisHandler.set(redisKey, JsonUtil.toJsonString(orderLineVoList));
+        redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(orderLineVoList));
         // 更新订货单变更状态
         // 更新订货单变更状态
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
         // 发起流程
         // 发起流程
@@ -272,10 +267,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, status)
         updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, status)
                 .eq(OrderInfoChangeRecord::getId, id);
                 .eq(OrderInfoChangeRecord::getId, id);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
-        if (OrderSpecChangeStatus.CANCEL.getCode().equals(status)
-                || OrderSpecChangeStatus.COMPLETED.getCode().equals(status)) {
+        if (OrderSpecChangeStatus.CANCEL.getCode().equals(status)) {
             // 更新订货单变更状态
             // 更新订货单变更状态
             purchaseOrderInfoService.updateSpecChangeStatus(record.getOrderId(), status);
             purchaseOrderInfoService.updateSpecChangeStatus(record.getOrderId(), status);
+        } else if ("PASS".equals(status)) {
+            // 更新订货单变更状态
+            purchaseOrderInfoService.updateSpecChangeStatus(record.getOrderId(), OrderSpecChangeStatus.COMPLETED.getCode());
         }
         }
     }
     }
 
 
@@ -291,7 +288,9 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 更新状态
         // 更新状态
         updateStatus(id, "PASS");
         updateStatus(id, "PASS");
         // 更新订货单数据
         // 更新订货单数据
-        purchaseOrderLineService.updateByChangeId(id, record.getOrderId());
+        purchaseOrderInfoService.update(JsonUtil.parseObject(JsonUtil.toJsonString(record), PurchaseOrderInfo.class));
+        // 更新订货单物料行数据
+        purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }
     }
 
 
     @Override
     @Override

@@ -342,6 +342,38 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
+    public void update(PurchaseOrderInfo orderInfo) {
+        if (StringUtils.isBlank(orderInfo.getId())) {
+            log.error("PurchaseOrderInfoService update orderInfo is null!");
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getOrderNo, StringUtil.isBlank(orderInfo.getOrderNo()) ? null : orderInfo.getOrderNo())
+                .set(PurchaseOrderInfo::getSupplyUnit, StringUtil.isBlank(orderInfo.getSupplyUnit()) ? null : orderInfo.getSupplyUnit())
+                .set(PurchaseOrderInfo::getOrderingUnit, StringUtil.isBlank(orderInfo.getOrderingUnit()) ? null : orderInfo.getOrderingUnit())
+                .set(PurchaseOrderInfo::getOrderDate, orderInfo.getOrderDate() == null ? null : orderInfo.getOrderDate())
+                .set(PurchaseOrderInfo::getSettlementTerms, StringUtil.isBlank(orderInfo.getSettlementTerms()) ? null : orderInfo.getSettlementTerms())
+                .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(orderInfo.getDeliveryMethod()) ? null : orderInfo.getDeliveryMethod())
+                .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(orderInfo.getPriceListNo()) ? null : orderInfo.getPriceListNo())
+                .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(orderInfo.getExecutionStandard()) ? null : orderInfo.getExecutionStandard())
+                .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(orderInfo.getInvoicingStatus()) ? null : orderInfo.getInvoicingStatus())
+                .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(orderInfo.getShippingCost()) ? null : orderInfo.getShippingCost())
+                .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(orderInfo.getPieceWeightHeader()) ? null : orderInfo.getPieceWeightHeader())
+                .set(PurchaseOrderInfo::getSurface, StringUtil.isBlank(orderInfo.getSurface()) ? null : orderInfo.getSurface())
+                .set(PurchaseOrderInfo::getTolerance, StringUtil.isBlank(orderInfo.getTolerance()) ? null : orderInfo.getTolerance())
+                .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(orderInfo.getPerformance()) ? null : orderInfo.getPerformance())
+                .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(orderInfo.getElement()) ? null : orderInfo.getElement())
+                .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(orderInfo.getPackaging()) ? null : orderInfo.getPackaging())
+                .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(orderInfo.getRemarks()) ? null : orderInfo.getRemarks())
+                .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(orderInfo.getProductionProcess()) ? null : orderInfo.getProductionProcess())
+                .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId())
+                .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId())
+                .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId())
+                .eq(PurchaseOrderInfo::getId, orderInfo.getId());
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -25,6 +25,7 @@ import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -235,16 +236,32 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     /**
     /**
-     * 根据变更记录ID更新
+     * 更新
      *
      *
-     * @param changeId   变更记录ID
+     * @param specList  数据集合
      */
      */
     @Override
     @Override
-    public void updateByChangeId(String changeId, String orderId) {
-        if (StringUtil.isBlank(changeId)) {
+    public void update(String orderId, List<PurchaseOrderLine> specList) {
+        if (StringUtils.isEmpty(orderId) || CollectionUtils.isEmpty(specList)) {
+            return;
+        }
+        // 先删再增
+        deleteByOrderId(orderId);
+        for (PurchaseOrderLine spec : specList) {
+            spec.setId(IdUtil.getId());
+            spec.setPurchaseOrderId(orderId);
+        }
+        batchAdd(specList);
+    }
+
+    @Override
+    public void deleteByOrderId(String orderId) {
+        if (StringUtils.isEmpty(orderId)) {
             return;
             return;
         }
         }
-        // todo 更新订货单数据
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
+        updateWrapper.eq(PurchaseOrderLine::getPurchaseOrderId, orderId);
+        getBaseMapper().delete(updateWrapper);
     }
     }
 
 
     @Override
     @Override

@@ -96,4 +96,11 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param status    状态
      * @param status    状态
      */
      */
     void updateSpecChangeStatus(String id, String status);
     void updateSpecChangeStatus(String id, String status);
+
+    /**
+     * 更新订货单信息
+     *
+     * @param orderInfo        订货单数据
+     */
+    void update(PurchaseOrderInfo orderInfo);
 }
 }

@@ -86,9 +86,16 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
     void batchUpdate(List<PurchaseOrderLine> specList);
     void batchUpdate(List<PurchaseOrderLine> specList);
 
 
     /**
     /**
-     * 根据变更记录ID更新
+     * 更新
      *
      *
-     * @param changeId   变更记录ID
+     * @param specList  数据集合
+     */
+    void update(String orderId, List<PurchaseOrderLine> specList);
+
+    /**
+     * 根据订货单ID删除
+     *
+     * @param orderId   订货单ID
      */
      */
-    void updateByChangeId(String changeId, String orderId);
+    void deleteByOrderId(String orderId);
 }
 }

@@ -83,7 +83,7 @@
 
 
     <insert id="batchAdd" parameterType="java.util.List">
     <insert id="batchAdd" parameterType="java.util.List">
         INSERT INTO tbl_purchase_order_line (
         INSERT INTO tbl_purchase_order_line (
-        id, purchase_order_id, change_id, industry, quality, brand,
+        id, purchase_order_id, industry, quality, brand,
         thickness, thickness_tol_pos, thickness_tol_neg,
         thickness, thickness_tol_pos, thickness_tol_neg,
         width, width_tol_pos, width_tol_neg,
         width, width_tol_pos, width_tol_neg,
         length, length_tol_pos, length_tol_neg,
         length, length_tol_pos, length_tol_neg,
@@ -92,7 +92,7 @@
         ) VALUES
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
         <foreach collection="specList" item="item" separator=",">
             (
             (
-            #{item.id}, #{item.purchaseOrderId}, #{item.changeId}, #{item.industry}, #{item.quality}, #{item.brand},
+            #{item.id}, #{item.purchaseOrderId}, #{item.industry}, #{item.quality}, #{item.brand},
             #{item.thickness}, #{item.thicknessTolPos}, #{item.thicknessTolNeg},
             #{item.thickness}, #{item.thicknessTolPos}, #{item.thicknessTolNeg},
             #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
             #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},