1

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -176,54 +176,105 @@ public class OutServiceImpl implements OutService {
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "承运单位不可为空！");
             return result;
         }
+        
+        // ========== 添加：数据验证日志 ==========
+        System.out.println("========== 配车出库开始 ==========");
+        System.out.println("配车单ID: " + distribution.getId());
+        System.out.println("配车单号: " + distribution.getTruckNo());
+        
+        // 验证配车明细是否为空
+        if(distribution.getListDetail() == null || distribution.getListDetail().isEmpty()){
+            System.out.println("错误：配车明细为空！");
+            throw new Exception("配车明细为空，无法执行出库操作！");
+        }
+        System.out.println("配车明细数量: " + distribution.getListDetail().size());
+        // ========== 验证日志结束 ==========
+        
         num += distributionMapper.updateByPrimaryKey(distribution);
         List<String> listStoreId = new ArrayList<String>();
         for (int i = 0; i < distribution.getListDetail().size(); i++) {
-            listStoreId.add(distribution.getListDetail().get(i).getStore().getId());
+            Store store = distribution.getListDetail().get(i).getStore();
+            if(store != null && store.getId() != null){
+                listStoreId.add(store.getId());
+                System.out.println("板子ID: " + store.getId() + ", 板号: " + store.getPlateNo());
+            }
+        }
+        
+        // ========== 添加：验证 storeId 列表 ==========
+        if(listStoreId.isEmpty()){
+            System.out.println("错误：有效的板子ID列表为空！");
+            throw new Exception("配车明细中无有效的板子信息！");
         }
+        System.out.println("有效板子数量: " + listStoreId.size());
+        // ========== 验证结束 ==========
+        
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("storeId", listStoreId);
         for(int i = 0 ;i < listStoreId.size();i++){
-            System.out.println(listStoreId.get(i));
+            System.out.println("查询的storeId: " + listStoreId.get(i));
         }
         List<StoreOfWareStack> listSows = storeMapper.selectWareStackByDistributionStore(map);
 
+        // ========== 添加：查询结果验证 ==========
+        System.out.println("查询到的库房垛位组合数: " + (listSows == null ? 0 : listSows.size()));
+        if(listSows == null || listSows.isEmpty()){
+            System.out.println("错误：根据storeId未查询到任何库房垛位记录！");
+            throw new Exception("根据板子ID未查询到库存记录，请检查板子是否存在或状态是否正常！");
+        }
+        // ========== 验证结束 ==========
+
         for (int m = 0; m < listSows.size(); m++) {
 
 
             Stack stack = stackMapper.selectByPrimaryKey(listSows.get(m).getStackId());
             Map<String, Object> mapParam = new HashMap<String, Object>();
             mapParam.put("storeId", listStoreId);
-            mapParam.put("wareId", listSows.get(m).getWareId());
-            mapParam.put("stackId", listSows.get(m).getStackId());
+            // ========== 修复：改为精确匹配，避免 null 值模糊匹配失败 ==========
+            mapParam.put("wareId", listSows.get(m).getWareId() == null ? "" : listSows.get(m).getWareId());
+            mapParam.put("stackId", listSows.get(m).getStackId() == null ? "" : listSows.get(m).getStackId());
+            // ========== 修复结束 ==========
 
             List<Store> listStore = storeMapper.selectByWareIdStackIdInStoreId(mapParam);
+            
+            // ========== 添加：每个垛位查询结果日志 ==========
+            System.out.println("库房ID: " + listSows.get(m).getWareId() + ", 垛位ID: " + listSows.get(m).getStackId() 
+                + ", 查询到板子数: " + (listStore == null ? 0 : listStore.size()));
+            
+            if(listStore == null || listStore.isEmpty()){
+                System.out.println("警告：该库房垛位下无有效板子，跳过处理");
+                continue;
+            }
+            // ========== 日志结束 ==========
+            
             if (stack.getIsLayer().equals("0") || stack.getIsLayer().equals("2")) {
+                // 分层不严格的库房垛位
                 for (int i = 0; i < listStore.size(); i++) {
                     OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
                     num += outRecordMapper.insert(outRecord);
+                    System.out.println("创建出库记录成功，板号: " + listStore.get(i).getPlateNo());
                     AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
                     num += accountDetailMapper.insert(accountDetail);
                     listStore.get(i).setOutId(outRecord.getId());
                     listStore.get(i).setOutFlag("1");
                     num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                    System.out.println("更新库存成功，板号: " + listStore.get(i).getPlateNo() + ", outFlag设为1");
                 }
                 result = Tools.moreThanZeroResultJSON(num);
             } else {
+                // 分层严格的库房垛位 - 需要检查层数
                 Collections.sort(listStore);
                 int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
                 int min = listStore.get(0).getLayer();
                 int max = listStore.get(listStore.size() - 1).getLayer();
                 if (currentLayer != max) {
                     throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
                 } else if (!WareTools.checkOrder(listStore)) {
                     throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
                 } else {
                     for (int i = 0; i < listStore.size(); i++) {
                         OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
                         num += outRecordMapper.insert(outRecord);
+                        System.out.println("创建出库记录成功，板号: " + listStore.get(i).getPlateNo());
 
                         AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
                         num += accountDetailMapper.insert(accountDetail);
@@ -231,12 +282,15 @@ public class OutServiceImpl implements OutService {
                         listStore.get(i).setOutId(outRecord.getId());
                         listStore.get(i).setOutFlag("1");
                         num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                        System.out.println("更新库存成功，板号: " + listStore.get(i).getPlateNo() + ", outFlag设为1");
 
                     }
                     result = Tools.moreThanZeroResultJSON(num);
                 }
             }
         }
+        System.out.println("========== 配车出库完成 ==========");
+        System.out.println("影响的记录数: " + num);
         return result;
     }
 

src/main/resource/mapper/ware/StoreMapper.xml

@@ -480,8 +480,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
              open="(" separator="," close=")">
       #{item}
     </foreach>
-    and t.ware_id like concat('%',#{wareId,jdbcType=VARCHAR},'%')
-    and t.stack_id like concat('%',#{stackId,jdbcType=VARCHAR},'%')
+    <if test="wareId != null and wareId != ''">
+      and t.ware_id like concat('%',#{wareId,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="stackId != null and stackId != ''">
+      and t.stack_id like concat('%',#{stackId,jdbcType=VARCHAR},'%')
+    </if>
   </select>