调试问题修改,入库单接口增加height

myproject/src/main/java/com/myproject/webapp/controller/custom803/XLController.java

@@ -114,6 +114,7 @@ public class XLController extends BaseController {
      * {
      *       "djh": "单据号唯一编码",
      *  "boxCode": "料箱编号",
+     *  "height": 240,
      * "materialList": [{
      *            "serialNo": "唯一码",
      *    "partNum": "存货编码",
@@ -135,10 +136,19 @@ public class XLController extends BaseController {
         String boxCodeStr = bodyParamMap.get("boxCode").toString();
         Object cidObj = bodyParamMap.get("deviceNo");
         Object doorObj = bodyParamMap.get("door");
+        Object height=bodyParamMap.get("height");
+        int boxH=0;
         if(doorObj == null){
             return ResultBean.newErrorResult(-1,"参数入料口door不能为空");
         }
-        log.info("料箱"+boxCodeStr+"准备放入["+cidObj+"]线体,生成入库任务");
+        if(height!=null){
+            try{
+                  boxH=Integer.parseInt(height.toString());
+            }catch (Exception exception){
+                log.error("高度转换失败："+height+","+exception.toString());
+            }
+        }
+        log.info("料箱"+boxCodeStr+",高："+boxH+"，准备放入["+cidObj+"]线体,生成入库任务");
         if(cidObj != null){
             String cid = cidObj.toString();
             Storage storage = dataCache.getStorage(cid);
@@ -167,6 +177,9 @@ public class XLController extends BaseController {
                         boxBarcode.setHeight(boxComponent.getHeight());
                         boxBarcode.setPlateSize(boxComponent.getPlateSize());
                     }
+                    if(boxH>0){
+                        boxBarcode.setHeight(boxH);
+                    }
                 }
                 List<Barcode> subCodeList = new ArrayList<>();
 
@@ -358,8 +371,8 @@ public class XLController extends BaseController {
         }
     }
 
-    private void putInFinished(DataLog task) throws  ValidateException {
-
+    private void putInFinished(DataLog task)   {
+        try {
             StoragePos storagePos = storagePosManager.get(task.getPosId());
             //二维码状态
             Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
@@ -391,6 +404,11 @@ public class XLController extends BaseController {
             task.setStatus(StorageConstants.OP_STATUS.FINISHED.name());
             task = dataLogDao.save(task);
             taskService.moveTaskToFinished(task);
+
+
+        } catch (Exception exception) {
+            log.error("putInFinished 仓位:" + task.getPosId() + " 出错：" + exception.toString());
+        }
     }
 
     /**
@@ -629,8 +647,8 @@ public class XLController extends BaseController {
             }
 
         } catch (Exception e) {
-            log.info("堆垛机放货完成, 通知极创出错:" + e.getMessage());
-            return ResultBean.newErrorResult(-1 ,e.getMessage());
+            log.info("堆垛机放货完成, 通知极创出错:" + e.toString());
+            return ResultBean.newErrorResult(-1 ,e.toString());
         }
     }
 
@@ -692,7 +710,7 @@ public class XLController extends BaseController {
             }
 
             log.info("料箱从库位取出, posName:" + posName + " barcode:" + queueTask.getBarcode() + "，任务状态：" + queueTask.getStatus());
-            OutFromPos(queueTask);
+//            OutFromPos(queueTask);
 
 //            for (DataLog queueTask : allTasks) {
 //                if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(posName)){
@@ -712,7 +730,7 @@ public class XLController extends BaseController {
             taskService.moveTaskToFinished(queueTask);
 
             Barcode box = barcodeManager.findByBarcode(queueTask.getBarcode());
-            if (box != null) {
+            if (box != null&&box.getSubCodes()!=null) {
                 List<Barcode> subCodes = box.getSubCodes();
                 for (Barcode subCode : subCodes) {
                     Map<String, Object> materialMap = new HashMap<>();
@@ -725,7 +743,7 @@ public class XLController extends BaseController {
             }
             dataMap.put("materialList", materialList);
             paramData.put("data", dataMap);
-            log.info("料箱从库位取出, 通知极创:" + bodyParamMap.toString());
+            log.info("料箱从库位取出, 通知极创:" + paramData.toString());
             String result = HttpHelper.postJson(inStorageFeedbackUrl, paramData);
             log.info("料箱从库位取出, 通知极创返回:" + result);
             return ResultBean.newOkResult("");
@@ -737,13 +755,16 @@ public class XLController extends BaseController {
         }
     }
 
-    private void OutFromPos(DataLog queueTask) throws ValidateException{
+    private void OutFromPos(DataLog queueTask) {
+
+        try {
             StoragePos storagePos = storagePosManager.get(queueTask.getPosId());
 
             Barcode barcode = storagePos.getBarcode();
             if (barcode == null) {
                 log.warn("任务:" + queueTask.getId() + " 仓位:" + queueTask.getPosId() + " 的 Barcode 为null, 之前可能处理过直接返回");
-        }else{
+                return;
+            } else {
                 barcode = barcodeManager.get(barcode.getId());
                 if (barcode != null) {
                     //二维码状态
@@ -766,6 +787,11 @@ public class XLController extends BaseController {
 
             //更新缓存中的库存信息
             dataCache.updateInventory(storagePos, barcode);
+
+
+        } catch (Exception exception) {
+            log.error("OutFromPos 仓位:" + queueTask.getPosId() + " 出错：" + exception.toString());
+        }
     }
 
     /**

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -537,7 +537,9 @@ public class TaskService implements ITaskService {
                 log.info("从" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
                 storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
             } else {
-                log.info("料仓" + storageCid + "有出库任务未完成,不允许入库");
+                log.info("料仓" + storageCid + "有出库任务，" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
+                storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
+//                log.info("料仓" + storageCid + "有出库任务未完成,不允许入库");
             }
         }
 //        boolean hasOutTask = hasExecutingTask(storageCid,StorageConstants.OP.CHECKOUT);