Browse Source

- 出库释放保留出库单号,提醒出货单是否已经释放完所有托盘;

Gizmo 1 year ago
parent
commit
7b4dca6476

+ 9 - 2
warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -1022,8 +1022,15 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         // 清除库存
         invLotLocIdService.clear(locationId, palletNo, Constant.WAREHOUSE_ID, "PDA");
         // 修改出库单状态
-        wmsDocOrderHeaderService.modifyAssignmentStockTaskStatusComplete(orderNo, locationId, palletNo, true);
-        return AjaxResult.success("托盘出库成功!" + palletNo);
+        AjaxResult result = wmsDocOrderHeaderService.modifyAssignmentStockTaskStatusComplete(orderNo, locationId, palletNo, true);
+        // 判断是否完成所有托盘出库
+        if (Constant.ORDER_STS.STS99.getValue().equals(result.getMsg())) {
+
+            return AjaxResult.success("托盘出库成功!" + palletNo + ",当前出库单已释放完所有托盘");
+        } else {
+
+            return AjaxResult.success("托盘出库成功!" + palletNo);
+        }
     }
 
     @Override

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -2344,7 +2344,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         headerUpdate.setOrderStatus(soStatus);
         headerUpdate.setUpdateTime(new Date());
         wmsDocOrderHeaderService.updateWmsDocOrderHeader(headerUpdate);
-        return AjaxResult.success();
+        return AjaxResult.success(soStatus);
     }
 
     @Override