更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java

@@ -912,6 +912,11 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
             HttpResponse result = acsToWmsService.queryCribbingInfo(json);
 
             if (ObjectUtil.isNotEmpty(result)) {
+                if (ObjectUtil.isEmpty(result.body())) {
+                    this.writing(20);
+                    this.setRequireSucess(true);
+                    return true;
+                }
                 JSONObject jsonObject = JSONObject.parseObject(result.body());
                 if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
                     JSONObject content = jsonObject.getJSONObject("content");

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java

@@ -352,6 +352,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                     }
                     //前工位申请任务
                     if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) {
+                        System.out.println("move_2:" + move_2 + ",action_2:" + action_2  + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1);
                         instruction_require();
                     }
                     break;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java

@@ -1138,6 +1138,11 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             HttpResponse result = acsToWmsService.queryCribbingInfo(json);
 
             if (ObjectUtil.isNotEmpty(result)) {
+                if (ObjectUtil.isEmpty(result.body())) {
+                    this.writing(20);
+                    this.setRequireSucess(true);
+                    return true;
+                }
                 JSONObject jsonObject = JSONObject.parseObject(result.body());
                 if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"), "200")) {
                     JSONObject content = jsonObject.getJSONObject("content");
@@ -1391,9 +1396,9 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             List<String> demoList = Arrays.asList(demoArray);
             json.put("device_code",demoList.get(put_station-1).replace("\"",""));
             //如果是1号对接位请求，那么数量就传1号垛数量
-            if (put_station == 1) {
+            if (put_station == 3) {
                 json.put("qty",one_qty);
-            } else if (put_station == 2) {
+            } else if (put_station == 4) {
                 json.put("qty",two_qty);
             }
             json.put("vehicle_code",barcode);

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java

@@ -125,7 +125,7 @@ public class StructFindUtil {
             // 先匹配类型
             if (StrUtil.equals(materialType, lineMaterialType)) {
                 // 如果规定了特定类型 且 物料类型和特定类型不一致 下一轮循环
-                if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(materialCode, lineMaterialCode)) {
+                if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0") && !StrUtil.equals(materialCode, lineMaterialCode)) {
                     continue;
                 }
                 return line;

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -213,7 +213,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         JSONObject jsonObject1 = WQL.getWO("ACSTOMES_001").addParam("flag", "1")
                                 .addParam("workprocedure_id", workprocedure_id)
                                 .addParam("material_id", material_id)
-                                .addParam("point_id", joo.getString("point_id"))
+                                .addParam("device_id", joo.getString("device_id"))
                                 .process().uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonObject1)) {
                             //如果有库存，则出半满托盘

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java

@@ -35,7 +35,7 @@ public class CheckOutServiceImpl implements CheckOutService {
         if (StrUtil.isEmpty(vehicle_code)) {
             throw new BadRequestException("托盘号不能为空！");
         }
-        JSONObject resutl = WQL.getWO("QPADSERVICE").addParam("flag", "17").process().uniqueResult(0);
+        JSONObject resutl = WQL.getWO("QPADSERVICE").addParam("flag", "17").addParam("vehicle_code",vehicle_code).process().uniqueResult(0);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql

@@ -29,6 +29,7 @@
 	输入.buss_area_type     		TYPEAS s_string
 	输入.height                		TYPEAS s_string
 	输入.searchbar            		TYPEAS s_string
+	输入.vehicle_code            		TYPEAS s_string
 
 
 [临时表]

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql

@@ -62,6 +62,7 @@
             WHERE
                 task.is_delete = '0'
                 and task.produceTask_status <> '05'
+                and task.produceTask_status <> '99'
             OPTION 输入.search <> ""
                 (task.producetask_code like 输入.search)
             ENDOPTION

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java

@@ -276,7 +276,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
         String task_status = TaskStatusEnum.SURE_END.getCode();
         String bill_status = "10";
         if (StrUtil.isNotEmpty(start_point_code)) {
-            PointDto startPoint = pointService.findByCode(start_point_code);
+//            PointDto startPoint = pointService.findByCode(start_point_code);
             bill_status = "20";
             task_status = TaskStatusEnum.START_AND_POINT.getCode();
             //锁定起点

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoOutStructTask.java

@@ -74,8 +74,9 @@ public class AutoOutStructTask {
             param.put("area_type", "01");
             param.put("if_full", "1");
             param.put("material_type", line.getString("material_type"));
-            if (StrUtil.isNotEmpty(line.getString("material_code"))) {
+            String lineMaterialCode = line.getString("material_code");
-                param.put("material_code", line.getString("material_code"));
+            if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0")) {
+                param.put("material_code", lineMaterialCode);
             }
                 JSONObject structObj = WQL.getWO("QSTRUCT_RULE").addParamMap(param).process().uniqueResult(0);
             if (ObjectUtil.isNotEmpty(structObj)) {