24282 1 éve
szülő
commit
e0a8d9183e

+ 8 - 0
sd-business/src/main/java/com/sd/business/service/order/impl/OrderInfoServiceImpl.java

@@ -65,6 +65,7 @@ import com.sd.business.service.price.PriceBillingStandardDetailService;
 import com.sd.business.service.price.PriceBillingStandardService;
 import com.sd.business.service.sku.SkuSpecLinkService;
 import com.sd.business.service.sku.SkuSpecService;
+import com.sd.business.service.work.impl.WorkOrderServiceImpl;
 import com.sd.business.util.CodeEnum;
 import com.sd.framework.util.Assert;
 import com.sd.framework.util.excel.util.ExcelUtil;
@@ -348,6 +349,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @DSTransactional
     @Override
     public void delete(Long id) {
+
+        boolean b = WorkOrderServiceImpl.schedulingLock.tryLock();
+        if (!b) {
+            throw new ServiceException("正在排版中,无法删除订单");
+        }
+        WorkOrderServiceImpl.schedulingLock.unlock();
+
         OrderInfo orderInfo = getById(id);
 
         if (orderInfo == null) {

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java

@@ -78,7 +78,7 @@ import java.util.stream.Stream;
 @Service
 public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
 
-    private static final ReentrantLock schedulingLock = new ReentrantLock();
+    public static final ReentrantLock schedulingLock = new ReentrantLock();
 
     @Autowired
     private BomSpecService bomSpecService;