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

@@ -118,10 +118,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 handlePurchaseOrderRevokeData(flowStatus, businessId);
                 handlePurchaseOrderRevokeData(flowStatus, businessId);
                 break;
                 break;
             case "SPEC_CHANGE_SUBMIT":
             case "SPEC_CHANGE_SUBMIT":
-                handleOrderSpecChangeData(flowStatus, businessId, true, true);
-                break;
             case "SPEC_CHANGE_CONFIRM":
             case "SPEC_CHANGE_CONFIRM":
-                handleOrderSpecChangeData(flowStatus, businessId, null, false);
+                handleOrderSpecChangeData(flowStatus, businessId);
                 break;
                 break;
             default:
             default:
                 break;
                 break;
@@ -353,17 +351,13 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
      * @param flowStatus    审核结果
      * @param flowStatus    审核结果
      * @param businessId    业务ID
      * @param businessId    业务ID
      */
      */
-    private void handleOrderSpecChangeData(String flowStatus, String businessId, Boolean output, boolean notice) {
+    private void handleOrderSpecChangeData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             orderChangeRecordService.reviewPass(businessId);
             orderChangeRecordService.reviewPass(businessId);
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
-                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)) {
-            orderChangeRecordService.reviewRefuse(businessId, output);
-            if (notice) {
-                // todo 消息通知
-            }
-        } else if (FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
             orderChangeRecordService.updateStatus(businessId, "REFUSE");
             orderChangeRecordService.updateStatus(businessId, "REFUSE");
         }
         }
     }
     }

@@ -270,9 +270,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         if (OrderSpecChangeStatus.CANCEL.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());
         }
         }
     }
     }
 
 
@@ -292,23 +289,4 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 更新订货单物料行数据
         // 更新订货单物料行数据
         purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
         purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }
     }
-
-    @Override
-    public void reviewRefuse(String id, Boolean output) {
-        if (StringUtils.isBlank(id)) {
-            return;
-        }
-        OrderInfoChangeRecord record = findById(id);
-        if (record == null) {
-            throw new DefaultClientException("规格变更记录不存在！");
-        }
-        // 更新状态
-        LambdaUpdateWrapper<OrderInfoChangeRecord> updateWrapper = Wrappers.lambdaUpdate(OrderInfoChangeRecord.class);
-        updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, "REFUSE")
-                .eq(OrderInfoChangeRecord::getId, id);
-        if (output != null) {
-            updateWrapper.set(OrderInfoChangeRecord::getOutput, output);
-        }
-        getBaseMapper().update(updateWrapper);
-    }
 }
 }

@@ -19,6 +19,7 @@ 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.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
@@ -369,6 +370,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId())
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId())
+                .set(PurchaseOrderInfo::getSpecChangeStatus, OrderSpecChangeStatus.COMPLETED.getCode())
                 .eq(PurchaseOrderInfo::getId, orderInfo.getId());
                 .eq(PurchaseOrderInfo::getId, orderInfo.getId());
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
     }
     }

@@ -261,6 +261,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         }
         LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
         LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
         updateWrapper.eq(PurchaseOrderLine::getPurchaseOrderId, orderId);
         updateWrapper.eq(PurchaseOrderLine::getPurchaseOrderId, orderId);
+
         getBaseMapper().delete(updateWrapper);
         getBaseMapper().delete(updateWrapper);
     }
     }
 
 

@@ -72,11 +72,4 @@ public interface OrderChangeRecordService extends BaseMpService<OrderInfoChangeR
      * @param id        主键ID
      * @param id        主键ID
      */
      */
     void reviewPass(String id);
     void reviewPass(String id);
-
-    /**
-     * 审批拒绝
-     *
-     * @param id        主键ID
-     */
-    void reviewRefuse(String id, Boolean output);
 }
 }

@@ -88,7 +88,8 @@
         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,
         status, quantity, sales_price, delivery_date, show_order,
         status, quantity, sales_price, delivery_date, show_order,
-        assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by
+        assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
+        create_time, update_time
         ) VALUES
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
         <foreach collection="specList" item="item" separator=",">
             (
             (
@@ -97,7 +98,8 @@
             #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
             #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
-            #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy}
+            #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
+            #{item.createTime}, #{item.updateTime}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>