更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -141,6 +141,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             container_type = itemProtocol.getContainer_type();
             if (mode != last_mode) {
                 this.setRequireSucess(false);
+                if (last_mode == 11) {
+                    this.writing(0);
+                }
                 logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
             }
@@ -248,12 +251,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                     break;
                 case 6:
                     //申请入库
-                    if (!requireSucess && this.move != 0) {
+                    if (!requireSucess && this.move != 0 && barcode != 0) {
                         putStorage("1");
                     }
                     break;
                 case 7:
-                    //申请入窑输送任务
+                    //申请入送线
                     if (!requireSucess && this.move != 0 && barcode != 0) {
                         intoKiln();
                     }
@@ -275,6 +278,11 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                     if (!requireSucess && this.move != 0) {
                         putStorage("3");
                     }
+                case 11:
+                    //半托缓存强制去包装
+                    if (!requireSucess && this.move != 0) {
+                        putStorage("1");
+                    }
                     break;
             }
 

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

@@ -369,7 +369,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_order_No", producetask_code);
                     rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_order_qty", qty);
                     rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_material_code", material_code);
-                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_material_type", vehicle_type);
+                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_product_code", product_code);
+                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
+                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
+                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
+                    rljnPackagePalletSplitManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
                     rljnPackagePalletSplitManipulatorDeviceDriver.writing(3);
                     is_flag = true;
                 }

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

@@ -91,6 +91,19 @@ public class StructFindUtil {
         if (StrUtil.isEmpty(area_type)) {
             throw new BadRequestException("区域不能为空！");
         }
+        if (ObjectUtil.isNotEmpty(vehicle_type)) {
+            if (vehicle_type.equals("1")) {
+                vehicle_type = "03";
+            } else if (vehicle_type.equals("2")) {
+                vehicle_type = "04";
+            } else if (vehicle_type.equals("3")) {
+                vehicle_type = "05";
+            } else if (vehicle_type.equals("4")) {
+                vehicle_type = "06";
+            } else if (vehicle_type.equals("5")) {
+                vehicle_type = "07";
+            }
+        }
         JSONObject result = new JSONObject();
         if (StrUtil.equals("05", area_type)) {
             result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "11")

wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java

@@ -55,6 +55,19 @@ public class MaterialServiceImpl implements MaterialService {
         for (int i = 0; i < content.size(); i++) {
             JSONObject jo = (JSONObject) content.get(i);
             Integer stewing_time = jo.getInteger("stewing_time");
+            String vehicle_type = jo.getString("vehicle_type");
+            if (vehicle_type.equals("03")) {
+                vehicle_type = "1";
+            } else if (vehicle_type.equals("04")) {
+                vehicle_type = "2";
+            } else if (vehicle_type.equals("05")) {
+                vehicle_type = "3";
+            } else if (vehicle_type.equals("06")) {
+                vehicle_type = "4";
+            } else if (vehicle_type.equals("07")) {
+                vehicle_type = "5";
+            }
+            jo.put("vehicle_type",vehicle_type);
             if (stewing_time != 0) {
                 jo.put("stewing_time",stewing_time/60);
             }
@@ -96,6 +109,17 @@ public class MaterialServiceImpl implements MaterialService {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
+        if (dto.getVehicle_type().equals("1")) {
+            dto.setVehicle_type("03");
+        } else if (dto.getVehicle_type().equals("2")) {
+            dto.setVehicle_type("04");
+        } else if (dto.getVehicle_type().equals("3")) {
+            dto.setVehicle_type("05");
+        } else if (dto.getVehicle_type().equals("4")) {
+            dto.setVehicle_type("06");
+        } else if (dto.getVehicle_type().equals("5")) {
+            dto.setVehicle_type("07");
+        }
         //将静置时间从小时改为分钟
         dto.setStewing_time(String.valueOf(Integer.valueOf(dto.getStewing_time())*60));
         dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId());
@@ -129,6 +153,17 @@ public class MaterialServiceImpl implements MaterialService {
         dto.setUpdate_optname(nickName);
         Long material_uuid = dto.getMaterial_id();
         String material_code = dto.getMaterial_code();
+        if (dto.getVehicle_type().equals("1")) {
+            dto.setVehicle_type("03");
+        } else if (dto.getVehicle_type().equals("2")) {
+            dto.setVehicle_type("04");
+        } else if (dto.getVehicle_type().equals("3")) {
+            dto.setVehicle_type("05");
+        } else if (dto.getVehicle_type().equals("4")) {
+            dto.setVehicle_type("06");
+        } else if (dto.getVehicle_type().equals("5")) {
+            dto.setVehicle_type("07");
+        }
         //将静置时间从小时改为分钟
         dto.setStewing_time(String.valueOf(Integer.valueOf(dto.getStewing_time())*60));
         WQLObject wo = WQLObject.getWQLObject("md_me_material");

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

@@ -426,7 +426,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
         WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
 
-        String task_id = taskTable.query("task_code='" + task_code + "'").uniqueResult(0).getString("task_id");
+        JSONObject taskobj = taskTable.query("task_code='" + task_code + "'").uniqueResult(0);
+        String task_id = "";
+        if (ObjectUtil.isNotEmpty(taskobj)) {
+            task_id = taskobj.getString("task_id");
+        } else {
+            throw new BadRequestException("未找到指令号'" + task_id);
+        }
         //将之前的托盘信息删除
         groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
         JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql

@@ -104,7 +104,7 @@
             FROM
             	sch_base_point point
             WHERE
-            	point.point_code IN ( 'FJJXSXLW301', 'FJJXSXLW302' )
+            	point.point_code IN ( 'FJJXSSLW301', 'FJJXSSLW302' )
         		ENDSELECT
         	ENDQUERY
         ENDIF
@@ -117,7 +117,7 @@ IF 输入.flag = "5"
       FROM
       	sch_base_point point
       WHERE
-      	point.point_code IN ( 'FJJXSXLW201', 'FJJXSXLW202' )
+      	point.point_code IN ( 'FJJXSSLW201', 'FJJXSSLW202' )
             ENDSELECT
         ENDQUERY
     ENDIF

wms/qd/src/views/wms/database/material/index.vue

@@ -43,6 +43,10 @@
             <label slot="label">物料类型</label>
             <el-input v-model="form.material_type" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="木托盘类型" prop="vehicle_type">
+            <label slot="label">木托盘类型</label>
+            <el-input v-model="form.vehicle_type" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="静止时间" prop="stewing_time">
             <el-input v-model="form.stewing_time" oninput="value=value.replace(/[^\d]/g,'')" style="width: 370px;" />
           </el-form-item>
@@ -76,6 +80,7 @@
         <el-table-column prop="material_spec" label="规格" />
         <el-table-column prop="material_model" label="型号" />
         <el-table-column prop="material_type" label="物料类型" />
+        <el-table-column prop="vehicle_type" label="木托盘类型" />
         <el-table-column prop="stewing_time" label="静止时间(小时)" width="110" />
         <el-table-column prop="english_name" label="外文名称" />
         <el-table-column prop="create_name" label="创建人" />
@@ -142,6 +147,7 @@ const defaultForm = {
   material_spec: null,
   material_model: null,
   material_type: null,
+  vehicle_type: null,
   english_name: null,
   create_id: null,
   create_name: null,
@@ -193,6 +199,9 @@ export default {
         material_type: [
           { required: true, message: '物料类型不能为空', trigger: 'blur' }
         ],
+        vehicle_type: [
+          { required: true, message: '物料类型不能为空', trigger: 'blur' }
+        ],
         stewing_time: [
           { required: true, message: '静止时间不能为空', trigger: 'blur' }
         ]