PDA出库拣货：提醒是否完全拣货

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

@@ -182,6 +182,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         }*/
         return result;
     }
+
     /**
      * 新增出库单头
      *
@@ -190,7 +191,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
      */
     @Transactional
     @Override
-    public int insertWmsDocOrderHeader(WmsDocOrderHeader wmsDocOrderHeader,String orderNo) {
+    public int insertWmsDocOrderHeader(WmsDocOrderHeader wmsDocOrderHeader, String orderNo) {
         wmsDocOrderHeader.setOrderNo(orderNo);
         wmsDocOrderHeader.setEdiSendFlag("N");
         int result = wmsDocOrderHeaderMapper.insertWmsDocOrderHeader(wmsDocOrderHeader);
@@ -751,6 +752,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         }
         wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(wmsDocOrderDetails);
         // 更新头单
+        String endMsg = "出货单已完全拣货！";
         String orderSts = Constant.ORDER_STS.STS99.getValue();
         WmsDocOrderHeader wmsDocOrderHeader = new WmsDocOrderHeader();
         wmsDocOrderHeader.setOrderNo(orderNo);
@@ -758,13 +760,14 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         for (WmsDocOrderDetails details : wmsDocOrderDetailsList) {
             if (!details.getLineStatus().equals(Constant.ORDER_STS.STS40.getValue())) {
                 orderSts = Constant.ORDER_STS.STS30.getValue();
+                endMsg = "出货单还有未完全拣货！";
                 break;
             }
         }
         wmsDocOrderHeader.setOrderStatus(orderSts);
         wmsDocOrderHeaderService.updateWmsDocOrderHeader(wmsDocOrderHeader);
 
-        return AjaxResult.success("拣货成功");
+        return AjaxResult.success("拣货成功！" + endMsg);
     }
 
     @Override
@@ -1406,7 +1409,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         header.setSoReference1(orderNo);
         header.setCreateBy(loginUser.getUsername());
         header.setCreateTime(new Date());
-        int result = wmsDocOrderHeaderService.insertWmsDocOrderHeader(header,orderNo);
+        int result = wmsDocOrderHeaderService.insertWmsDocOrderHeader(header, orderNo);
         if (result <= 0) {
             return AjaxResult.error("生成出库单头失败！");
         }
@@ -1436,7 +1439,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             //库位对应所有库存lotatt15记录分配出库单号
             invLotLocIdService.updateLotatt15ByLocationId(inv.getLocationId().toString(), orderNo);
         }
-       return AjaxResult.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @Transactional