出库单据

ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java

@@ -16,4 +16,6 @@ public class RequestEnter {
     private String entranceId;
     //入库楼层 1-一楼 2-二楼
     private String floor;
+
+    private  String type;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -92,6 +92,7 @@ public class ToWmsServiceImpl implements IToWmsService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
+
         if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
             return AjaxResult.error("托盘条码不能为空");
         }
@@ -147,7 +148,8 @@ public class ToWmsServiceImpl implements IToWmsService {
             return new AjaxResult(3, "超大托盘");
         }
         //托盘大小与电气返回不匹配
-        if (size != Integer.parseInt(requestEnter.getSize())) {
+
+        if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
             return new AjaxResult(4, "托盘大小不匹配");
         }
 
@@ -244,6 +246,11 @@ public class ToWmsServiceImpl implements IToWmsService {
         //修改货位状态
         basCargoSpace.setStatus("3");
         basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
+        //type=1是手持机调用
+        if(!"1".equals(requestEnter.getType())){
+            mydoJob.setStatus("3");
+            mydoJobService.updateMydoJob(mydoJob);
+        }
 
         if ("1".equals(mydoJob.getInOrOut())) {
             //存入调拨单数据 已生成