修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.10</version>
+    <version>1.12</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/OyeWarehouseController.java

@@ -85,13 +85,15 @@ public class OyeWarehouseController extends BaseRESTfulController {
         try {
             // 成功
             int result = oyeWarehouseService.addTransPlan(mapValue);
-            Map<String,Object> compareMap = amsSaleMaterialMapper.getCompareMap(result);
-            BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(compareMap.get("orderMaterialNumber"));
-            BigDecimal materialNumber= DataChange.dataToBigDecimal(compareMap.get("materialNumber"));
-            if (orderMaterialNumber.compareTo(materialNumber) > 0) {
-                //删除销售订单
-                amsSaleMaterialMapper.updateSaleStatus(result);
-                return failed(mapValue.get("receiveName") + "超出库存数量,系统删除,请重新输入");
+            List<Map<String,Object>> compareMapList = amsSaleMaterialMapper.getCompareMap(result);
+            for (Map<String,Object> compareMap : compareMapList) {
+                BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(compareMap.get("orderMaterialNumber"));
+                BigDecimal materialNumber= DataChange.dataToBigDecimal(compareMap.get("materialNumber"));
+                if (orderMaterialNumber.compareTo(materialNumber) > 0) {
+                    //删除销售订单
+                    amsSaleMaterialMapper.updateSaleStatus(result);
+                    return failed(mapValue.get("receiveName") + "超出库存数量,系统删除,请重新输入");
+                }
             }
             return success(result);
         } catch (Exception e) {
@@ -122,13 +124,15 @@ public class OyeWarehouseController extends BaseRESTfulController {
                 saleOrderNo = map.get("saleOrderNo").toString();
                 count++;
                 int saleOrderId = oyeWarehouseService.addTransPlan(map);
-                Map<String,Object> compareMap = amsSaleMaterialMapper.getCompareMap(saleOrderId);
-                BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(compareMap.get("orderMaterialNumber"));
-                BigDecimal materialNumber= DataChange.dataToBigDecimal(compareMap.get("materialNumber"));
-                if (orderMaterialNumber.compareTo(materialNumber) > 0) {
-                    //删除销售订单
-                    amsSaleMaterialMapper.updateSaleStatus(saleOrderId);
-                    return failed(map.get("receiveName") + "超出库存数量,系统删除,请重新输入");
+                List<Map<String,Object>> compareMapList = amsSaleMaterialMapper.getCompareMap(saleOrderId);
+                for (Map<String,Object> compareMap : compareMapList) {
+                    BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(compareMap.get("orderMaterialNumber"));
+                    BigDecimal materialNumber= DataChange.dataToBigDecimal(compareMap.get("materialNumber"));
+                    if (orderMaterialNumber.compareTo(materialNumber) > 0) {
+                        //删除销售订单
+                        amsSaleMaterialMapper.updateSaleStatus(saleOrderId);
+                        return failed(map.get("receiveName") + "超出库存数量,系统删除,请重新输入");
+                    }
                 }
                 //根据销售订单ID再去查询汇总一遍
             }

src/main/java/com/steerinfo/dil/mapper/AmsSaleMaterialMapper.java

@@ -62,7 +62,7 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     BigDecimal selectInventoryId(Map<String, Object> searchInventoryMap);
 
-    Map<String, Object> getCompareMap(int saleOrderId);
+    List<Map<String, Object>> getCompareMap(int saleOrderId);
 
     int updateSaleStatus(int saleOrderId);