Merge branch 'refs/heads/mode-min-unit' into mode-min-unit-xh

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsProductionOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
 import com.rongwei.bsentity.vo.DeleteOrderVo;
+import com.rongwei.bsentity.vo.OrderHaveBeChangedReq;
 import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
@@ -32,4 +33,6 @@ public interface ApsProductionOrderService extends IService<ApsProductionOrderDo
     void reportUnqualify();
 
     R saveHistoryInfo(String id);
+
+    R haveBeChanged(OrderHaveBeChangedReq req);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -753,6 +753,22 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         return null;
     }
 
+    @Override
+    public R haveBeChanged(OrderHaveBeChangedReq req) {
+        //当前页面的订单数据
+        ApsProductionOrderDo oldApsProductionOrderDo = req.getApsProductionOrderDo();
+
+        //数据库中的订单数据
+        ApsProductionOrderDo nowApsProductionOrderDo = this.getById(req.getOrderId());
+
+        //如果 评审状态 不一致
+        if(!oldApsProductionOrderDo.getAuditstatus().equals(nowApsProductionOrderDo.getAuditstatus())){
+            return R.error("该订单已被其他人提交，不能保存或提交");
+        }
+
+        return R.ok();
+    }
+
 }
 
 

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/OrderHaveBeChangedReq.java

@@ -0,0 +1,17 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.ApsProductionOrderDo;
+import lombok.Data;
+
+/**
+ * @author ：sc
+ * @since ：2024/8/6
+ */
+@Data
+public class OrderHaveBeChangedReq {
+    //订单ID
+    private String orderId;
+
+    //当前订单信息
+    private ApsProductionOrderDo apsProductionOrderDo;
+}

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -5,6 +5,7 @@ import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.bsentity.domain.ApsProductionTechnicalRequirementDo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
 import com.rongwei.bsentity.vo.DeleteOrderVo;
+import com.rongwei.bsentity.vo.OrderHaveBeChangedReq;
 import com.rongwei.rwcommon.base.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,4 +124,12 @@ public class ApsProductionOrderController {
             return R.error("保存历史版本失败");
         }
     }
+
+    /**
+     * 订单操作之前，判断是否有人更改
+     */
+    @PostMapping("/haveBeChanged")
+    public R haveBeChanged(@RequestBody OrderHaveBeChangedReq req){
+        return apsProductionOrderService.haveBeChanged(req);
+    }
 }