工位上货问题

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -86,6 +86,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Resource
     IoCollectOrderBizService collectOrderBizService;
     @Resource
+    IoOrderDetailResultService orderDetailResultService;
+    @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
     BasicSkPrescribeService basicSkPrescribeService;
@@ -249,6 +251,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         orderService.deleteByBillNo(billNo);
                         orderDetailBizService.deleteByOrderId(billNo);
                         orderDetailCodeService.deleteByOrderId(billNo);
+                        orderDetailResultService.deleteByOrderId(billNo);
                         codeTempService.deleteByBillNo(billNo);
                         codeService.deleteCodeByOrderId(billNo);
                     }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -454,7 +454,7 @@ public class IoAddInoutService {
             for (IoOrderDetailCodeEntity orderDetailCodeEntity : ioOrderDetailCodeEntities) {
                 if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue()
                         && StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo()))
-                        && BigDecimalUtil.equalTo(orderDetailCodeEntity.getPrice(), codeTempEntity.getPrice())
+                        && BigDecimalUtil.equalTo(IntUtil.value(orderDetailCodeEntity.getPrice()), IntUtil.value(codeTempEntity.getPrice()))
                 ) {
                     orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getMyCount());
                     orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getMyReCount());

src/main/java/com/glxp/api/util/IntUtil.java

@@ -2,6 +2,8 @@ package com.glxp.api.util;
 
 import cn.hutool.core.util.StrUtil;
 
+import java.math.BigDecimal;
+
 public class IntUtil {
 
     public static int value(Integer value) {
@@ -11,6 +13,14 @@ public class IntUtil {
 
     }
 
+    public static BigDecimal value(BigDecimal value) {
+        if (value == null)
+            return new BigDecimal(0);
+        else return value;
+
+    }
+
+
     public static long value(Long value) {
         if (value == null)
             return 0l;