rev 混料工单

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialDetailDto.java

@@ -31,20 +31,15 @@ public class MaterialDetailDto implements Serializable {
      */
     private String material_name;
 
-    /**
+    private String furnace;
-     * 订单编号
-     */
-    private String order_number;
 
-    /**
+    private String material_brick_type;
-     * 客户名称
-     */
-    private String customer_name;
 
-    /**
+    private String bom_code;
-     * 产品名称
+
-     */
+    private String order_code;
-    private String product_name;
+
+    private String customer_code;
 
     /**
      * 产品牌号
@@ -85,4 +80,6 @@ public class MaterialDetailDto implements Serializable {
      * 修改时间
      */
     private String update_time;
+
+    private String is_delete;
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java

@@ -55,4 +55,6 @@ public class MaterialbaseDto implements Serializable {
     private String is_used;
 
     private Double weight;
+
+    private String material_type;
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialDetailServiceImpl.java

@@ -2,9 +2,11 @@
 package org.nl.wms.basedata.service.impl;
 
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.WQL;
 import org.nl.wms.basedata.service.MaterialDetailService;
 import org.nl.wms.basedata.service.dto.MaterialDetailDto;
 import org.springframework.stereotype.Service;
@@ -12,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.data.domain.Pageable;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,10 +41,10 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        WQLObject wo = WQLObject.getWQLObject("md_me_material_detail");
+        HashMap<String, String> map = new HashMap<>();
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete = '0'", "update_time desc");
+        map.put("flag", "1");
-        final JSONObject json = rb.pageResult();
+
-        return json;
+        return WQL.getWO("QMD_ME_MATERIAL_DETAIL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "md.create_time DESC");
     }
 
     @Override
@@ -82,9 +85,6 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
         dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId());
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
-        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
-        dto.setUpdate_time(now);
         dto.setCreate_time(now);
 
         WQLObject wo = WQLObject.getWQLObject("md_me_material_detail");

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java

@@ -50,6 +50,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
         map.put("search", name);
+        map.put("material_type", MapUtil.getStr(whereJson, "material_type"));
 
         return WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
     }
@@ -104,11 +105,11 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         dto.setMaterial_id(id);
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
-        dto.setUpdate_optid(currentUserId);
+        dto.setCreate_time(now);
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.insert(json);
 
-        // 解析物料编码 ZLMCZ1001C122211GM001BD20-8
+        // 解析物料编码
         JSONObject material_detail = new JSONObject();
         material_detail.put("material_id", id);
         material_detail.put("material_code", material_code);
@@ -118,22 +119,40 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         if (ObjectUtil.isEmpty(furnace_name)) {
             throw new BadRequestException("物料编码解析错误：未知炉型！");
         }
-        material_detail.put("product_name", furnace_name.getString("label") + "镁碳砖");
+        material_detail.put("furnace", furnace_code);
-        material_detail.put("order_number", material_code.substring(11, 16));
+        String material_brick_code = material_code.substring(2, 5);
-        material_detail.put("customer_name", material_code.substring(16, 21));
+        JSONObject material_brick_type = dict_detail_table.query("name = 'material_brick_type' AND value = '" + material_brick_code + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(material_brick_type)) {
+            throw new BadRequestException("物料编码解析错误：未知物料砖类型！");
+        }
+        material_detail.put("material_brick_type", material_brick_code);
+
+        String bom_code = material_code.substring(5, 11);
+        JSONObject bom = new JSONObject();
+        bom.put("material_id", IdUtil.getSnowflake(1, 1).nextId());
+        bom.put("material_code", bom_code);
+        bom.put("material_type", "2");
+        bom.put("create_id", currentUserId);
+        bom.put("create_name", nickName);
+        bom.put("create_time", now);
+        JSONObject old_bom = wo.query("material_code = '" + bom_code + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(old_bom)) {
+            wo.insert(bom);
+        }
+
+        material_detail.put("bom_code", bom_code);
+        material_detail.put("order_code", material_code.substring(11, 16));
+        material_detail.put("customer_code", material_code.substring(16, 21));
         String product_grade_code = material_code.substring(21, 23);
         JSONObject product_grade = dict_detail_table.query("name = 'product_grade' AND value = '" + product_grade_code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(product_grade)) {
             throw new BadRequestException("物料编码解析错误：未知牌号！");
         }
-        material_detail.put("product_grade", product_grade.getString("label"));
+        material_detail.put("product_grade", product_grade_code);
         material_detail.put("brick_type", material_code.substring(23));
         material_detail.put("create_id", currentUserId);
         material_detail.put("create_name", nickName);
         material_detail.put("create_time", now);
-        material_detail.put("update_optid", currentUserId);
-        material_detail.put("update_optname", nickName);
-        material_detail.put("update_time", now);
         WQLObject.getWQLObject("md_me_material_detail").insert(material_detail);
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql

@@ -18,6 +18,7 @@
 	输入.class_code			            TYPEAS s_string
     输入.idssql			                TYPEAS f_string
     输入.classIds			            TYPEAS f_string
+    输入.material_type			        TYPEAS f_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -50,11 +51,10 @@
             WHERE
                 is_delete = '0'
                 OPTION 输入.search <> ""
-                    (
                     mb.material_code like '%' 输入.search '%'
-                    OR
+                ENDOPTION
-                    mb.material_name like '%' 输入.search '%'
+                OPTION 输入.material_type <> ""
-                    )
+                    mb.material_type = 输入.material_type
                 ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY

lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL_DETAIL.wql

@@ -0,0 +1,56 @@
+[交易说明]
+	交易名：	物料详情分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+        PAGEQUERY
+            SELECT
+            	md.*,
+            	d1.label AS 'furnace_name',
+            	d2.label AS 'material_brick_type_name',
+            	d3.label AS 'product_grade_name'
+            FROM
+            	md_me_material_detail md
+            	LEFT JOIN sys_dict_detail d1 ON d1.`value` = md.furnace AND d1.`name` = 'furnace'
+            	LEFT JOIN sys_dict_detail d2 ON d2.`value` = md.material_brick_type AND d2.`name` = 'material_brick_type'
+            	LEFT JOIN sys_dict_detail d3 ON d3.`value` = md.product_grade AND d3.`name` = 'product_grade'
+            WHERE
+                md.is_delete = '0'
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF

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

@@ -225,16 +225,49 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         switch (type) {
             case "1":
                 // 送料
-                String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
-                if ("0000".equals(vehicle_code)) {
-                    throw new BadRequestException("载具编码不能为空！");
-                }
-                method_param.put("vehicle_code", vehicle_code);
-
                 switch (region) {
                     case HL:
                         JSONObject workorder = TaskUtils.hasWorkOrder(point);
                         method_param.put("workorder", workorder);
+                        String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
+                        if ("0000".equals(vehicle_code)) {
+                            throw new BadRequestException("载具编码不能为空！");
+                        }
+                        method_param.put("vehicle_code", vehicle_code);
+                        String weight = param.getString("weight");
+                        if (StrUtil.isBlank(weight)) {
+                            throw new BadRequestException("重量不能为空！");
+                        }
+                        String is_full = param.getString("is_full");
+                        if (StrUtil.isBlank(is_full)) {
+                            throw new BadRequestException("是否满垛不能为空！");
+                        }
+                        WQLObject vd_table = WQLObject.getWQLObject("st_ivt_vehicle_detail");
+                        JSONObject vd_update = new JSONObject();
+                        vd_update.put("is_delete", "1");
+                        vd_update.put("update_optid", ACSSystem.id);
+                        vd_update.put("update_optname", ACSSystem.nick_name);
+                        String now = DateUtil.now();
+                        vd_update.put("update_time", now);
+                        vd_table.update(vd_update, "vehicle_type = '1' AND vehicle_code = '" + vehicle_code + "' AND is_delete = '0'");
+
+                        JSONObject vd = new JSONObject();
+                        vd.put("vd_id", IdUtil.getSnowflake(1L, 1L).nextId());
+                        vd.put("vehicle_type", VehicleType.CUP.value());
+                        vd.put("vehicle_code", vehicle_code);
+                        vd.put("material_id", workorder.getString("material_id"));
+                        vd.put("weight", weight);
+                        vd.put("is_full", is_full);
+                        vd.put("workorder_id", workorder.getString("workorder_id"));
+                        vd.put("point_code", point_code);
+                        vd.put("create_id", ACSSystem.id);
+                        vd.put("create_name", ACSSystem.nick_name);
+                        vd.put("create_time", now);
+                        vd.put("is_in_kiln", "0");
+                        vd.put("stand_status", "2");
+                        vd_table.insert(vd);
+                        method_param.put("vd", vd);
+
                         task_code = hlSendMaterialTask.createTask(method_param);
                         break;
                     case YZ:
@@ -243,8 +276,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         task_code = yzSendMaterialTask.createTask(method_param);
                         break;
                     case SZ:
-                        WQLObject vd_table = WQLObject.getWQLObject("st_ivt_vehicle_detail");
+                        vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
-                        JSONObject vd = vd_table
+                        if ("0000".equals(vehicle_code)) {
+                            throw new BadRequestException("载具编码不能为空！");
+                        }
+                        method_param.put("vehicle_code", vehicle_code);
+                        vd_table = WQLObject.getWQLObject("st_ivt_vehicle_detail");
+                        vd = vd_table
                                 .query("is_delete = '0' AND vehicle_type = '2' AND vehicle_code = '" + vehicle_code + "'")
                                 .uniqueResult(0);
                         if (ObjectUtil.isEmpty(vd)) {
@@ -281,11 +319,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 break;
             case "3":
                 // 送空
-                vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
+                String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));
                 if ("0000".equals(vehicle_code)) {
                     vehicle_code = point.getString("vehicle_code");
                     if (StrUtil.isBlank(vehicle_code) || "0000".equals(vehicle_code)) {
-                        throw new BadRequestException("未知载具编码！");
+                        throw new BadRequestException("载具编码不能为空！");
                     }
                 }
                 method_param.put("vehicle_code", vehicle_code);
@@ -307,19 +345,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 // 叫空
                 switch (region) {
                     case HL:
-                        String device_code = point.getString("device_code");
                         workorder = WQLObject
                                 .getWQLObject("pdm_bd_workorder")
-                                .query("is_delete = '0' AND device_code = '" + device_code + "' AND order_status = '3'")
+                                .query("is_delete = '0' AND device_code = '" + point.getString("device_code") + "' AND order_status = '3'")
                                 .uniqueResult(0);
                         method_param.put("workorder", workorder);
                         task_code = hlCallEmptyTask.createTask(method_param);
                         break;
                     case YZ:
-                        device_code = point.getString("device_code");
                         workorder = WQLObject
                                 .getWQLObject("pdm_bd_workorder")
-                                .query("is_delete = '0' AND device_code = '" + device_code + "' AND order_status = '3'")
+                                .query("is_delete = '0' AND device_code = '" + point.getString("device_code") + "' AND order_status = '3'")
                                 .uniqueResult(0);
                         method_param.put("workorder", workorder);
                         task_code = yzCallEmptyTask.createTask(method_param);

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java

@@ -46,7 +46,7 @@ public class DeviceServiceImpl implements DeviceService {
         if (!StrUtil.isEmpty(search)) {
             map.put("search", "%" + search + "%");
         }
-        JSONObject json = WQL.getWO("PDM_BI_DEVICE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "device.device_code");
+        JSONObject json = WQL.getWO("PDM_BI_DEVICE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "device.device_model ASC, device.device_code ASC");
         return json;
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/HLCallEmptyTask.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch.task.call.empty;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -36,17 +37,17 @@ public class HLCallEmptyTask extends AbstractAcsTask {
         }
     }
 
-    
     @Override
     public String createTask(JSONObject form) {
         JSONObject point = form.getJSONObject("point");
-
+        JSONObject work_order = form.getJSONObject("workorder");
-        TaskUtils.isEmptyPoint(point);
+        int priority = 1;
-        TaskUtils.isLocked(point);
+        if (ObjectUtil.isNotEmpty(work_order)) {
-        JSONObject work_order = TaskUtils.hasWorkOrder(point);
+            priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1;
+        }
 
         JSONObject task = TaskUtils.buildTask(
-                "混料机叫空托盘",
+                "混料区叫空",
                 TaskType.CALL_EMPTY.value(),
                 TaskStatus.SURE_END.value(),
                 null,
@@ -55,7 +56,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
                 null,
                 VehicleType.CUP.value(),
                 null,
-                TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1,
+                priority,
                 HLCallEmptyTask.class.getName(),
                 form.getString("create_mode"),
                 form.getString("request_param"),
@@ -64,10 +65,14 @@ public class HLCallEmptyTask extends AbstractAcsTask {
         );
         WQLObject.getWQLObject("sch_base_task").insert(task);
 
+        point.put("lock_type", LockType.TASK_LOCKED.value());
+        point.put("task_code", task.getString("task_code"));
+        TaskUtils.addFormUpdateColum(point, form);
+        WQLObject.getWQLObject("sch_base_point").update(point);
+
         return task.getString("task_code");
     }
 
-    
     @Override
     public void findStartPoint() {
         WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -75,34 +80,35 @@ public class HLCallEmptyTask extends AbstractAcsTask {
                 .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_END.value() + "' AND handle_class = '" + HLCallEmptyTask.class.getName() + "'", "priority DESC, create_time ASC")
                 .getResultJSONArray(0);
 
-        WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
+        if (ObjectUtil.isNotEmpty(tasks)) {
-        for (int i = 0; i < tasks.size(); i++) {
+            WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-            JSONObject task = tasks.getJSONObject(i);
 
-            JSONObject point = WQL
+            for (int i = 0; i < tasks.size(); i++) {
-                    .getWO("CALL_EMPTY_TASK")
+                JSONObject task = tasks.getJSONObject(i);
-                    .addParam("flag", "1")
-                    .addParam("vehicle_type", task.getString("vehicle_type"))
-                    .process()
-                    .uniqueResult(0);
 
-            if (ObjectUtil.isNotEmpty(point)) {
+                JSONObject point = WQL
-                task.put("task_status", TaskStatus.START_AND_END.value());
+                        .getWO("CALL_EMPTY_TASK")
-                task.put("point_code1", point.getString("point_code"));
+                        .addParam("flag", "5")
-                task.put("vehicle_code", point.getString("vehicle_code"));
+                        .process()
-                task.put("remark", "");
+                        .uniqueResult(0);
-                task_table.update(task);
 
-                point.put("lock_type", LockType.TASK_LOCKED.value());
+                if (ObjectUtil.isNotEmpty(point)) {
-                point_table.update(point);
+                    task.put("task_status", TaskStatus.START_AND_END.value());
-            } else {
+                    task.put("point_code1", point.getString("point_code"));
-                task.put("remark", "未找到合适的叫空载具点位！");
+                    task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code")));
-                task_table.update(task);
+                    task.put("remark", "");
+                    TaskUtils.addAutoUpdateColum(task);
+                    task_table.update(task);
+
+                    point.put("lock_type", LockType.TASK_LOCKED.value());
+                    point.put("task_code", task.getString("task_code"));
+                    TaskUtils.addAutoUpdateColum(point);
+                    point_table.update(point);
+                }
             }
         }
     }
 
-    
     @Override
     public void forceFinish(String task_id) {
         JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -112,7 +118,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
         this.finishTask(task, OperationType.MANUAL);
     }
 
-    
+
     @Override
     public void cancel(String task_id) {
         JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -122,7 +128,6 @@ public class HLCallEmptyTask extends AbstractAcsTask {
         this.cancelTask(task, OperationType.MANUAL);
     }
 
-    
     public void cancelTask(JSONObject task, OperationType operation_type) {
         if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
             task.put("task_status", TaskStatus.CANCELLED.value());
@@ -134,41 +139,47 @@ public class HLCallEmptyTask extends AbstractAcsTask {
             WQLObject.getWQLObject("sch_base_task").update(task);
 
             WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-            JSONObject point1 = point_table.query("point_code = '" + task.getString("point_code1") + "'").uniqueResult(0);
+
-            if (ObjectUtil.isNotEmpty(point1)
+            String point_code1 = task.getString("point_code1");
-                    && LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
+            if (StrUtil.isNotBlank(point_code1)) {
-                    && task.getString("task_code").equals(point1.getString("task_code"))) {
+                JSONObject point1 = point_table.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                point1.put("lock_type", LockType.UNLOCKED.value());
+                if (ObjectUtil.isNotEmpty(point1)
-                point1.put("task_code", "");
+                        && LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
-                if (operation_type == OperationType.AUTO) {
+                        && task.getString("task_code").equals(point1.getString("task_code"))) {
-                    TaskUtils.addACSUpdateColum(point1);
+                    point1.put("lock_type", LockType.UNLOCKED.value());
-                } else if (operation_type == OperationType.MANUAL) {
+                    point1.put("task_code", "");
-                    TaskUtils.addCurrentUpdateColum(point1);
+                    if (operation_type == OperationType.AUTO) {
+                        TaskUtils.addACSUpdateColum(point1);
+                    } else if (operation_type == OperationType.MANUAL) {
+                        TaskUtils.addCurrentUpdateColum(point1);
+                    }
+                    point_table.update(point1);
                 }
-                point_table.update(point1);
             }
 
-            JSONObject point2 = new JSONObject();
+            String point_code2 = task.getString("point_code2");
-            point2.put("lock_type", LockType.UNLOCKED.value());
+            if (StrUtil.isNotBlank(point_code2)) {
-            point2.put("task_code", "");
+                JSONObject point2 = new JSONObject();
-            if (operation_type == OperationType.AUTO) {
+                point2.put("lock_type", LockType.UNLOCKED.value());
-                TaskUtils.addACSUpdateColum(point2);
+                point2.put("task_code", "");
-            } else if (operation_type == OperationType.MANUAL) {
+                if (operation_type == OperationType.AUTO) {
-                TaskUtils.addCurrentUpdateColum(point2);
+                    TaskUtils.addACSUpdateColum(point2);
+                } else if (operation_type == OperationType.MANUAL) {
+                    TaskUtils.addCurrentUpdateColum(point2);
+                }
+                point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
-            point_table.update(point2, "point_code = '" + task.getString("point_code2") + "'");
         }
     }
 
-    
+    public void finishTask(JSONObject task, OperationType operation_type) {
-        public void finishTask(JSONObject task, OperationType operation_type) {
         int current_task_status = task.getIntValue("task_status");
         if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) {
             if (operation_type == OperationType.MANUAL
-                && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
+                    && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
                 throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！");
             }
-            
+
             task.put("task_status", TaskStatus.FINISHED.value());
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(task);
@@ -178,30 +189,43 @@ public class HLCallEmptyTask extends AbstractAcsTask {
             WQLObject.getWQLObject("sch_base_task").update(task);
 
             WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-            JSONObject point1 = point_table.query("point_code = '" + task.getString("point_code1") + "'").uniqueResult(0);
+
-            if (LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
+            String point_code1 = task.getString("point_code1");
-                    && task.getString("task_code").equals(point1.getString("task_code"))) {
+            if (StrUtil.isNotBlank(point_code1)) {
-                point1.put("lock_type", LockType.UNLOCKED.value());
+                JSONObject point1 = point_table.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                point1.put("task_code", "");
+                if (ObjectUtil.isNotEmpty(point1)) {
-                point1.put("vehicle_type", "");
+                    if (LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
-                point1.put("vehicle_code", "");
+                            && task.getString("task_code").equals(point1.getString("task_code"))) {
-                point1.put("point_status", PointStatus.EMPTY.value());
+                        point1.put("lock_type", LockType.UNLOCKED.value());
-                TaskUtils.addCurrentUpdateColum(point1);
+                        point1.put("task_code", "");
-                point_table.update(point1);
+                        point1.put("vehicle_type", "");
+                        point1.put("vehicle_code", "");
+                        point1.put("point_status", PointStatus.EMPTY.value());
+                        if (operation_type == OperationType.AUTO) {
+                            TaskUtils.addACSUpdateColum(point1);
+                        } else if (operation_type == OperationType.MANUAL) {
+                            TaskUtils.addCurrentUpdateColum(point1);
+                        }
+                        point_table.update(point1);
+                    }
+                }
             }
 
-            JSONObject point2 = new JSONObject();
+            String point_code2 = task.getString("point_code2");
-            point2.put("lock_type", LockType.UNLOCKED.value());
+            if (StrUtil.isNotBlank(point_code2)) {
-            point2.put("task_code", "");
+                JSONObject point2 = new JSONObject();
-            point2.put("vehicle_type", task.getString("vehicle_type"));
+                point2.put("lock_type", LockType.UNLOCKED.value());
-            point2.put("vehicle_code", task.getString("vehicle_code"));
+                point2.put("task_code", "");
-            point2.put("point_status", PointStatus.NOT_EMPTY.value());
+                point2.put("vehicle_type", task.getString("vehicle_type"));
-            if (operation_type == OperationType.AUTO) {
+                point2.put("vehicle_code", task.getString("vehicle_code"));
-                TaskUtils.addACSUpdateColum(point2);
+                point2.put("point_status", PointStatus.NOT_EMPTY.value());
-            } else if (operation_type == OperationType.MANUAL) {
+                if (operation_type == OperationType.AUTO) {
-                TaskUtils.addCurrentUpdateColum(point2);
+                    TaskUtils.addACSUpdateColum(point2);
+                } else if (operation_type == OperationType.MANUAL) {
+                    TaskUtils.addCurrentUpdateColum(point2);
+                }
+                point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
-            point_table.update(point2, "point_code = '" + task.getString("point_code2") + "'");
         }
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql

@@ -113,3 +113,24 @@
             ENDSELECT
         ENDQUERY
     ENDIF
+
+    IF 输入.flag = "5"
+        QUERY
+            SELECT
+                point.*
+            FROM
+                sch_base_point point
+                LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type
+                AND point.vehicle_code = vd.vehicle_code
+                AND vd.is_delete = '0'
+            WHERE
+                is_used = '1'
+                AND lock_type = '1'
+                AND region_code = 'KLHJ'
+                AND point_type = '1'
+                AND point_status = '1'
+                AND point.vehicle_type = '1'
+                AND vd.vd_id IS NULL
+            ENDSELECT
+        ENDQUERY
+    ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java

@@ -52,7 +52,7 @@ public class FJSendMaterialTask extends AbstractAcsTask {
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                null,
+                vd.getLong("vd_id"),
                 vd.getString("material_id"),
                 vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
@@ -67,7 +67,7 @@ public class FJSendMaterialTask extends AbstractAcsTask {
         if (TrueOrFalse.trueOrFalse(vd.getString("is_full"))) {
             JSONObject pn = TaskUtils.buildPN(PickType.CP, vd.getLongValue("qty"), vd.getLongValue("workorder_id"));
             WQLObject.getWQLObject("das_produce_number").insert(pn);
-            material_task.put("group_id", pn.getLong("data_id"));
+            material_task.put("table_fk_id", pn.getLong("data_id"));
 
             JSONObject empty_task = TaskUtils.buildTask(
                     "分拣区叫空",
@@ -243,7 +243,7 @@ public class FJSendMaterialTask extends AbstractAcsTask {
                 point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
 
-            String data_id = task.getString("group_id");
+            String data_id = task.getString("table_fk_id");
             if (TaskType.SEND_MATERIAL.value().equals(task.getString("task_type"))
                 && StrUtil.isNotBlank(data_id)) {
                 WQLObject.getWQLObject("das_produce_number").delete("data_id = " + data_id);

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch.task.send.material;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -8,11 +9,10 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.basedata.eum.TrueOrFalse;
-import org.nl.wms.basedata.eum.VehicleType;
+import org.nl.wms.common.PickType;
 import org.nl.wms.sch.manage.*;
 import org.nl.wms.sch.task.util.TaskUtils;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 辽宁晟华混料 送料入库 任务类
@@ -38,74 +38,95 @@ public class HLSendMaterialTask extends AbstractAcsTask {
         }
     }
 
+
     @Override
     public String createTask(JSONObject form) {
         JSONObject point = form.getJSONObject("point");
+        JSONObject work_order = form.getJSONObject("workorder");
+        int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1;
+        JSONObject vd = form.getJSONObject("vd");
 
-        TaskUtils.isLocked(point);
+        JSONObject pn = TaskUtils.buildPN(PickType.YL, vd.getLongValue("qty"), vd.getLongValue("workorder_id"));
-        JSONObject work_order = TaskUtils.hasWorkOrder(point);
+        WQLObject.getWQLObject("das_produce_number").insert(pn);
-
-        String vehicle_code = form.getString("vehicle_code");
-        if ("0000".equals(vehicle_code)) {
-            throw new BadRequestException("载具编码不能为空！");
-        }
-
-        // todo 组盘
 
         JSONObject task = TaskUtils.buildTask(
-                "混料机送料入库",
+                "混料区送料",
                 TaskType.SEND_MATERIAL.value(),
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                null,
+                vd.getLong("vd_id"),
-                work_order.getString("material_id"),
+                vd.getString("material_id"),
-                VehicleType.CUP.value(),
+                vd.getString("vehicle_type"),
-                vehicle_code,
+                vd.getString("vehicle_code"),
-                TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1,
+                priority,
                 HLSendMaterialTask.class.getName(),
                 form.getString("create_mode"),
                 form.getString("request_param"),
                 form.getString("create_id"),
                 form.getString("create_name")
         );
+        task.put("table_fk_id", pn.getLong("data_id"));
         WQLObject.getWQLObject("sch_base_task").insert(task);
 
+        point.put("lock_type", LockType.TASK_LOCKED.value());
+        point.put("task_code", task.getString("task_code"));
+        TaskUtils.addFormUpdateColum(point, form);
+        WQLObject.getWQLObject("sch_base_point").update(point);
+
         return task.getString("task_code");
     }
 
-    
+
     @Override
     public void findNextPoint() {
         WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
         JSONArray tasks = task_table
-                .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_START.value() + "' AND handle_class = '" + YZSendMaterialTask.class.getName() + "'", "priority DESC, create_time ASC")
+                .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_START.value() + "' AND handle_class = '" + HLSendMaterialTask.class.getName() + "'", "priority DESC, create_time ASC")
                 .getResultJSONArray(0);
-        WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
 
-        for (int i = 0; i < tasks.size(); i++) {
+        if (ObjectUtil.isNotEmpty(tasks)) {
-            JSONObject task = tasks.getJSONObject(i);
+            WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
 
-            JSONObject point = WQL
+            for (int i = 0; i < tasks.size(); i++) {
-                    .getWO("SEND_MATERIAL_TASK")
+                JSONObject task = tasks.getJSONObject(i);
-                    .addParam("flag", "1")
-                    .process()
-                    .uniqueResult(0);
 
-            if (ObjectUtil.isNotEmpty(point)) {
+                JSONObject point1 = point_table.query("point_code = '" + task.getString("point_code1") + "'").uniqueResult(0);
-                task.put("task_status", TaskStatus.START_AND_END.value());
+                JSONObject point2 = null;
-                task.put("point_code2", point.getString("point_code"));
+                if (ObjectUtil.isNotEmpty(point1) && "2".equals(point1.getString("point_type"))) {
-                task.put("remark", "");
+                    point2 = WQL
-                task_table.update(task);
+                            .getWO("SEND_MATERIAL_TASK")
+                            .addParam("flag", "4")
+                            .addParam("material_id", task.getString("material_id"))
+                            .process()
+                            .uniqueResult(0);
+                }
 
-                point.put("lock_type", LockType.TASK_LOCKED.value());
+                if (ObjectUtil.isEmpty(point2)) {
-                point.put("task_code", task.getString("task_code"));
+                    point2 = WQL
-                point_table.update(point);
+                            .getWO("SEND_MATERIAL_TASK")
+                            .addParam("flag", "5")
+                            .process()
+                            .uniqueResult(0);
+                }
+
+                if (ObjectUtil.isNotEmpty(point2)) {
+                    task.put("task_status", TaskStatus.START_AND_END.value());
+                    task.put("point_code2", point2.getString("point_code"));
+                    task.put("remark", "");
+                    TaskUtils.addAutoUpdateColum(task);
+                    task_table.update(task);
+
+                    point2.put("lock_type", LockType.TASK_LOCKED.value());
+                    point2.put("task_code", task.getString("task_code"));
+                    TaskUtils.addAutoUpdateColum(point2);
+                    point_table.update(point2);
+                }
             }
         }
     }
 
-    
+
     @Override
     public void forceFinish(String task_id) {
         JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -115,7 +136,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
         this.finishTask(task, OperationType.MANUAL);
     }
 
-    
+
     @Override
     public void cancel(String task_id) {
         JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -125,7 +146,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
         this.cancelTask(task, OperationType.MANUAL);
     }
 
-    
+
     public void cancelTask(JSONObject task, OperationType operation_type) {
         if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
             task.put("task_status", TaskStatus.CANCELLED.value());
@@ -137,40 +158,49 @@ public class HLSendMaterialTask extends AbstractAcsTask {
             WQLObject.getWQLObject("sch_base_task").update(task);
 
             WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-            JSONObject point1 = point_table.query("point_code = '" + task.getString("point_code1") + "'").uniqueResult(0);
+
-            if (LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
+            String point_code1 = task.getString("point_code1");
-                    && task.getString("task_code").equals(point1.getString("task_code"))) {
+            if (StrUtil.isNotBlank(point_code1)) {
-                point1.put("lock_type", LockType.UNLOCKED.value());
+                JSONObject point1 = point_table.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                point1.put("task_code", "");
+                if (LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
-                if (operation_type == OperationType.AUTO) {
+                        && task.getString("task_code").equals(point1.getString("task_code"))) {
-                    TaskUtils.addACSUpdateColum(point1);
+                    point1.put("lock_type", LockType.UNLOCKED.value());
-                } else if (operation_type == OperationType.MANUAL) {
+                    point1.put("task_code", "");
-                    TaskUtils.addCurrentUpdateColum(point1);
+                    if (operation_type == OperationType.AUTO) {
+                        TaskUtils.addACSUpdateColum(point1);
+                    } else if (operation_type == OperationType.MANUAL) {
+                        TaskUtils.addCurrentUpdateColum(point1);
+                    }
+                    point_table.update(point1);
                 }
-                point_table.update(point1);
             }
 
-            JSONObject point2 = new JSONObject();
+            String point_code2 = task.getString("point_code2");
-            point2.put("lock_type", LockType.UNLOCKED.value());
+            if (StrUtil.isNotBlank(point_code2)) {
-            point2.put("task_code", "");
+                JSONObject point2 = new JSONObject();
-            if (operation_type == OperationType.AUTO) {
+                point2.put("lock_type", LockType.UNLOCKED.value());
-                TaskUtils.addACSUpdateColum(point2);
+                point2.put("task_code", "");
-            } else if (operation_type == OperationType.MANUAL) {
+                if (operation_type == OperationType.AUTO) {
-                TaskUtils.addCurrentUpdateColum(point2);
+                    TaskUtils.addACSUpdateColum(point2);
+                } else if (operation_type == OperationType.MANUAL) {
+                    TaskUtils.addCurrentUpdateColum(point2);
+                }
+                point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
-            point_table.update(point2, "point_code = '" + task.getString("point_code2") + "'");
+
+            WQLObject.getWQLObject("das_produce_number").delete("data_id = " + task.getLongValue("table_fk_id"));
         }
     }
 
-    
+
-        public void finishTask(JSONObject task, OperationType operation_type) {
+    public void finishTask(JSONObject task, OperationType operation_type) {
         int current_task_status = task.getIntValue("task_status");
         if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) {
             if (operation_type == OperationType.MANUAL
-                && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
+                    && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) {
                 throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！");
             }
-            
+
             task.put("task_status", TaskStatus.FINISHED.value());
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(task);
@@ -180,31 +210,42 @@ public class HLSendMaterialTask extends AbstractAcsTask {
             WQLObject.getWQLObject("sch_base_task").update(task);
 
             WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-            JSONObject point1 = point_table.query("point_code = '" + task.getString("point_code1") + "'").uniqueResult(0);
+
-            if (ObjectUtil.isNotEmpty(point1)
+            String point_code1 = task.getString("point_code1");
-                    && LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
+            if (StrUtil.isNotBlank(point_code1)) {
-                    && task.getString("task_code").equals(point1.getString("task_code"))) {
+                JSONObject point1 = point_table.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                point1.put("lock_type", LockType.UNLOCKED.value());
+                if (ObjectUtil.isNotEmpty(point1)
-                point1.put("task_code", "");
+                        && LockType.TASK_LOCKED.value().equals(point1.getString("lock_type"))
-                point1.put("vehicle_type", "");
+                        && task.getString("task_code").equals(point1.getString("task_code"))) {
-                point1.put("vehicle_code", "");
+                    point1.put("lock_type", LockType.UNLOCKED.value());
-                point1.put("point_status", PointStatus.EMPTY.value());
+                    point1.put("task_code", "");
-                TaskUtils.addCurrentUpdateColum(point1);
+                    point1.put("vehicle_type", "");
-                point_table.update(point1);
+                    point1.put("vehicle_code", "");
+                    point1.put("point_status", PointStatus.EMPTY.value());
+                    if (operation_type == OperationType.AUTO) {
+                        TaskUtils.addACSUpdateColum(point1);
+                    } else if (operation_type == OperationType.MANUAL) {
+                        TaskUtils.addCurrentUpdateColum(point1);
+                    }
+                    point_table.update(point1);
+                }
             }
 
-            JSONObject point2 = new JSONObject();
+            String point_code2 = task.getString("point_code2");
-            point2.put("lock_type", LockType.UNLOCKED.value());
+            if (StrUtil.isNotBlank(point_code2)) {
-            point2.put("task_code", "");
+                JSONObject point2 = new JSONObject();
-            point2.put("vehicle_type", task.getString("vehicle_type"));
+                point2.put("lock_type", LockType.UNLOCKED.value());
-            point2.put("vehicle_code", task.getString("vehicle_code"));
+                point2.put("task_code", "");
-            point2.put("point_status", PointStatus.NOT_EMPTY.value());
+                point2.put("vehicle_type", task.getString("vehicle_type"));
-            if (operation_type == OperationType.AUTO) {
+                point2.put("vehicle_code", task.getString("vehicle_code"));
-                TaskUtils.addACSUpdateColum(point2);
+                point2.put("point_status", PointStatus.NOT_EMPTY.value());
-            } else if (operation_type == OperationType.MANUAL) {
+                if (operation_type == OperationType.AUTO) {
-                TaskUtils.addCurrentUpdateColum(point2);
+                    TaskUtils.addACSUpdateColum(point2);
+                } else if (operation_type == OperationType.MANUAL) {
+                    TaskUtils.addCurrentUpdateColum(point2);
+                }
+                point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
-            point_table.update(point2, "point_code = '" + task.getString("point_code2") + "'");
         }
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java

@@ -46,7 +46,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                null,
+                vd.getLong("vd_id"),
                 vd.getString("material_id"),
                 vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java

@@ -53,7 +53,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                pn.getLongValue("data_id"),
+                vd.getLong("vd_id"),
                 vd.getString("material_id"),
                 vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
@@ -64,6 +64,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 form.getString("create_id"),
                 form.getString("create_name")
         );
+        task.put("table_fk_id", pn.getLong("data_id"));
         WQLObject.getWQLObject("sch_base_task").insert(task);
 
         point.put("lock_type", LockType.TASK_LOCKED.value());
@@ -172,7 +173,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 point_table.update(point2, "point_code = '" + point_code2 + "'");
             }
 
-            WQLObject.getWQLObject("das_produce_number").delete("data_id = " + task.getLongValue("group_id"));
+            WQLObject.getWQLObject("das_produce_number").delete("data_id = " + task.getLongValue("table_fk_id"));
         }
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql

@@ -16,6 +16,7 @@
 	输入.flag                         TYPEAS s_string
 	输入.is_full                      TYPEAS s_string
 	输入.vehicle_type                 TYPEAS s_string
+	输入.material_id                  TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -98,3 +99,40 @@
         ENDQUERY
     ENDIF
 
+    IF 输入.flag = "4"
+        QUERY
+            SELECT
+            	point.*
+            FROM
+            	sch_base_point point
+            	JOIN pdm_bi_device device ON point.device_code = device.device_code
+            	LEFT JOIN pdm_bd_workorder workorder ON device.device_id = workorder.device_id AND workorder.order_status = '3'
+            	LEFT JOIN md_me_materialbase mb1 ON workorder.material_id = mb1.material_id AND mb1.material_type = '1'
+            	LEFT JOIN md_me_material_detail md1 ON mb1.material_id = md1.material_id
+            	LEFT JOIN md_me_materialbase mb2 ON md1.bom_code = mb2.material_code AND mb2.material_type = '2'
+            WHERE
+            	point.is_used = '1'
+            	AND point.lock_type = '1'
+            	AND point.region_code = 'KLHJ'
+            	AND point.point_type = '2'
+            	AND point.point_status = '0'
+            	AND mb2.material_id = 输入.material_id
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
+    IF 输入.flag = "5"
+        QUERY
+            SELECT
+            	*
+            FROM
+            	sch_base_point
+            WHERE
+            	is_used = '1'
+            	AND lock_type = '1'
+            	AND region_code = 'KLHJ'
+            	AND point_type = '1'
+            	AND point_status = '0'
+            ENDSELECT
+        ENDQUERY
+    ENDIF

lms/nladmin-system/src/test/java/org/nl/test/PointTest.java

@@ -2,11 +2,9 @@ package org.nl.test;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -21,9 +19,22 @@ public class PointTest {
 
     @Test
     public void test01() {
-        String pattern = "^\\d+$";
+        JSONObject point = new JSONObject();
-        System.out.println("ddd".matches(pattern));
+        WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-        System.out.println("0010".matches(pattern));
+        String now = DateUtil.now();
-        System.out.println("1232d".matches(pattern));
+        for (int i = 0; i < 48; i++) {
+            point.put("point_id", IdUtil.getSnowflake(1L, 1L).nextId());
+            point.put("point_code", "KLHW" + String.format("%02d", i + 1));
+            point.put("point_name", "困料货位" + (i + 1));
+            point.put("region_id", "1643186988158947328");
+            point.put("region_code", "KLHJ");
+            point.put("region_name", "困料货架");
+            point.put("point_type", "1");
+            point.put("lock_type", "1");
+            point.put("create_id", 1);
+            point.put("create_name", "管理员");
+            point.put("create_time", now);
+            point_table.insert(point);
+        }
     }
 }

lms/nladmin-ui/src/views/wms/basedata/bom/index.vue

@@ -0,0 +1,287 @@
+<template>
+  <div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix="："
+        >
+          <el-form-item label="BOM编码">
+            <el-input
+              v-model="query.name"
+              clearable
+              placeholder="BOM编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="600px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="BOM编码" prop="material_code">
+                <el-input :disabled="crud.status.edit" v-model="form.material_code" clearable style="width: 300px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="静置时间" prop="standing_time">
+                <el-input v-model="form.standing_time" type="number" style="width: 300px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="阈值时间" prop="threshold_time">
+                <el-input v-model="form.threshold_time" type="number" style="width: 300px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="info" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'BOM编码')" />
+        <el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
+        <el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column
+          v-permission="[]"
+          label="操作"
+          fixed="right"
+          width="120px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :is-visiable-del="false"
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMaterialbase from '@/api/wms/basedata/materialbase'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/classstandard'
+import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
+
+const defaultForm = {
+  material_id: null,
+  ass_unit_id: null,
+  material_code: null,
+  material_name: null,
+  standing_time: null,
+  threshold_time: null,
+  a: null,
+  b: null,
+  h: null,
+  w: null,
+  product_code: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  weight: null,
+  material_type: '2'
+}
+export default {
+  name: 'BOM',
+  // 数据字典
+  dicts: ['is_used'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: 'BOM',
+      optShow: { add: false, reset: true },
+      url: 'api/Materialbase',
+      idField: 'material_id',
+      sort: 'material_id,desc',
+      crudMethod: { ...crudMaterialbase },
+      query: {
+        material_type: '2'
+      }
+    })
+  },
+  data() {
+    return {
+      classes1: [],
+      classes2: [],
+      classes3: [],
+      fullscreenLoading: false,
+      measure_unit: [],
+      productSeries: [],
+      permission: {},
+      rules: {
+        material_code: [
+          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    [CRUD.HOOK.beforeToCU](crud, form) {
+      crudMdPbMeasureunit.getUnit().then(res => {
+        this.measure_unit = res.content
+      })
+      // 物料标识为空，新增
+      if (!form.material_type_id) {
+        form.material_type_id = null // 必须为null，否则会出现unknown
+      } else { // 更新
+        this.getSubTypes('02', form.material_type_id)
+      }
+      // 物料系列为空，新增
+      if (!form.product_series) {
+        form.product_series = null // 必须为null，否则会出现unknown
+      } else { // 更新
+        this.getSubTypes('03', form.product_series)
+      }
+    },
+    getSubTypes(type, id) {
+      const that = this
+      crudClassstandard.getClassSuperior(id).then(res => {
+        const data = res.content
+        that.buildTree(data)
+        if (type === '02') {
+          that.classes2 = data
+        }
+        if (type === '03') {
+          that.classes3 = data
+        }
+      })
+    },
+    synchronize() {
+      this.fullscreenLoading = true
+      crudMaterialbase.synchronize(this.crud.query).then(res => {
+        this.fullscreenLoading = false
+        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudMaterialbase.edit(data).then(res => {
+          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          if (data.is_used === '0') {
+            data.is_used = '1'
+            return
+          }
+          if (data.is_used === '1') {
+            data.is_used = '0'
+          }
+        })
+      }).catch(() => {
+        if (data.is_used === '0') {
+          data.is_used = '1'
+          return
+        }
+        if (data.is_used === '1') {
+          data.is_used = '0'
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue

@@ -14,25 +14,70 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
           <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="form.material_code" style="width: 370px;" />
+            <el-input v-model="form.material_code" :disabled="crud.status.edit" placeholder="物料编码" style="width: 300px;" />
           </el-form-item>
-          <el-form-item label="物料名称">
+          <el-form-item label="物料名称" prop="material_name">
-            <el-input v-model="form.material_name" style="width: 370px;" />
+            <el-input v-model="form.material_name" placeholder="物料名称" style="width: 300px;" />
           </el-form-item>
-          <el-form-item label="订单编号" prop="order_number">
+          <el-form-item label="炉型" prop="furnace">
-            <el-input v-model="form.order_number" style="width: 370px;" />
+            <el-select
+              v-model="form.furnace"
+              placeholder="炉型"
+              style="width: 300px"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in dict.furnace"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="客户名称" prop="customer_name">
+          <el-form-item label="物料砖类型" prop="material_brick_type">
-            <el-input v-model="form.customer_name" style="width: 370px;" />
+            <el-select
+              v-model="form.material_brick_type"
+              placeholder="物料砖类型"
+              style="width: 300px"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in dict.material_brick_type"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="产品名称" prop="product_name">
+          <el-form-item label="BOM编码" prop="bom_code">
-            <el-input v-model="form.product_name" style="width: 370px;" />
+            <el-input v-model="form.bom_code" placeholder="BOM编码" style="width: 300px;" />
           </el-form-item>
-          <el-form-item label="产品牌号" prop="product_grade">
+          <el-form-item label="订单编码" prop="order_code">
-            <el-input v-model="form.product_grade" style="width: 370px;" />
+            <el-input v-model="form.order_code" placeholder="订单编码" style="width: 300px;" />
+          </el-form-item>
+          <el-form-item label="客户编码" prop="customer_code">
+            <el-input v-model="form.customer_code" placeholder="客户编码" style="width: 300px;" />
+          </el-form-item>
+          <el-form-item label="牌号" prop="product_grade">
+            <el-select
+              v-model="form.product_grade"
+              placeholder="物料砖类型"
+              style="width: 300px"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in dict.product_grade"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="砖型" prop="brick_type">
-            <el-input v-model="form.brick_type" style="width: 370px;" />
+            <el-input v-model="form.brick_type" placeholder="砖型" style="width: 300px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -59,24 +104,34 @@
           :min-width="flexWidth('material_name',crud.data,'物料名称')"
         />
         <el-table-column
-          prop="order_number"
+          prop="furnace_name"
-          label="订单编号"
+          label="炉型"
-          :min-width="flexWidth('order_number',crud.data,'订单编号')"
+          :min-width="flexWidth('furnace_name',crud.data,'炉型')"
         />
         <el-table-column
-          prop="customer_name"
+          prop="material_brick_type_name"
-          label="客户名称"
+          label="物料砖类型"
-          :min-width="flexWidth('customer_name',crud.data,'客户名称')"
+          :min-width="flexWidth('material_brick_type_name',crud.data,'物料砖类型')"
         />
         <el-table-column
-          prop="product_name"
+          prop="bom_code"
-          label="产品名称"
+          label="BOM编码"
-          :min-width="flexWidth('product_name',crud.data,'产品名称')"
+          :min-width="flexWidth('bom_code',crud.data,'BOM编码')"
         />
         <el-table-column
-          prop="product_grade"
+          prop="order_code"
-          label="产品牌号"
+          label="订单编码"
-          :min-width="flexWidth('product_grade',crud.data,'产品牌号')"
+          :min-width="flexWidth('order_code',crud.data,'订单编码')"
+        />
+        <el-table-column
+          prop="customer_code"
+          label="客户编码"
+          :min-width="flexWidth('customer_code',crud.data,'客户编码')"
+        />
+        <el-table-column
+          prop="product_grade_name"
+          label="牌号"
+          :min-width="flexWidth('product_grade_name',crud.data,'牌号')"
         />
         <el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
@@ -102,7 +157,6 @@
 <script>
 import crudMaterialDetail from '@/api/wms/basedata/materialDetail'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
@@ -111,9 +165,11 @@ const defaultForm = {
   material_id: null,
   material_code: null,
   material_name: null,
-  order_number: null,
+  furnace: null,
-  customer_name: null,
+  material_brick_type: null,
-  product_name: null,
+  bom_code: null,
+  order_code: null,
+  customer_code: null,
   product_grade: null,
   brick_type: null,
   create_id: null,
@@ -121,11 +177,13 @@ const defaultForm = {
   create_time: null,
   update_optid: null,
   update_optname: null,
-  update_time: null
+  update_time: null,
+  is_delete: '0'
 }
 export default {
   name: 'MaterialDetail',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  dicts: ['furnace', 'material_brick_type', 'product_grade'],
+  components: { pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -149,6 +207,27 @@ export default {
       rules: {
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ],
+        furnace: [
+          { required: true, message: '炉型不能为空', trigger: 'blur' }
+        ],
+        material_brick_type: [
+          { required: true, message: '物料砖类型不能为空', trigger: 'blur' }
+        ],
+        bom_code: [
+          { required: true, message: 'BOM编码不能为空', trigger: 'blur' }
+        ],
+        order_code: [
+          { required: true, message: '订单编码不能为空', trigger: 'blur' }
+        ],
+        customer_code: [
+          { required: true, message: '客户编码不能为空', trigger: 'blur' }
+        ],
+        product_grade: [
+          { required: true, message: '牌号不能为空', trigger: 'blur' }
+        ],
+        brick_type: [
+          { required: true, message: '砖型不能为空', trigger: 'blur' }
         ]
       }
     }

lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -22,18 +22,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
+      <crudOperation :permission="permission" />
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="synchronize()"
-        >
-          同步
-        </el-button>
-      </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -50,20 +39,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="静置时间" prop="standing_time">
-                <el-input v-model="form.standing_time" type="number" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="阈值时间" prop="threshold_time">
-                <el-input v-model="form.threshold_time" type="number" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="单重" prop="weight">
@@ -122,8 +97,6 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
-        <el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
         <el-table-column prop="weight" label="单重" :min-width="flexWidth('weight',crud.data,'单重')" />
         <el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
         <el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
@@ -185,7 +158,8 @@ const defaultForm = {
   update_optid: null,
   update_optname: null,
   update_time: null,
-  weight: null
+  weight: null,
+  material_type: '1'
 }
 export default {
   name: 'Materialbase',
@@ -200,7 +174,10 @@ export default {
       url: 'api/Materialbase',
       idField: 'material_id',
       sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialbase }
+      crudMethod: { ...crudMaterialbase },
+      query: {
+        material_type: '1'
+      }
     })
   },
   data() {

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -98,33 +98,12 @@
         width="600px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item v-if="false" label="物料标识" prop="material_id">
-                <el-input v-model="form.material_id" style="width: 300px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="物料编码" prop="material_code">
-                <el-input
-                  :disabled="crud.status.edit"
-                  v-model="form.material_code"
-                  style="width: 300px"
-                  clearable
-                  @focus="materialShow=true"
-                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="生产设备" prop="device_name">
                 <el-input
-                  :disabled="crud.status.edit"
                   v-model="form.device_name"
+                  :disabled="crud.status.edit"
                   style="width: 300px"
                   clearable
                   @focus="deviceShow=true"
@@ -133,17 +112,45 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code !== 'HL'" label="物料编码" prop="material_code">
+                <el-input
+                  v-model="form.material_code"
+                  :disabled="crud.status.edit"
+                  style="width: 300px"
+                  clearable
+                  @focus="materialShow=true"
+                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'HL'" label="BOM编码" prop="material_code">
+                <el-input
+                  v-model="form.material_code"
+                  :disabled="crud.status.edit"
+                  style="width: 300px"
+                  clearable
+                  @focus="bomShow=true"
+                  @clear="form.material_id=''; form.material_code=''; form.material_name=''"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划数量/重量" prop="plan_qty">
-                <el-input :disabled="crud.status.edit" v-model="form.plan_qty" type="number" style="width: 300px" />
+                <el-input v-model="form.plan_qty" :disabled="crud.status.edit" type="number" style="width: 300px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
-                <el-select :disabled="crud.status.edit" v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
+                <el-select v-model="form.vehicle_type" :disabled="crud.status.edit" style="width: 300px" filterable placeholder="请选择">
                   <el-option
                     v-for="item in dict.wood_vehicle_type"
                     :key="item.id"
@@ -157,16 +164,16 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否加急" prop="is_urgent">
-                <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="1">是</el-radio>
+                <el-radio v-model="form.is_urgent" :disabled="crud.status.edit" label="1">是</el-radio>
-                <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="0">否</el-radio>
+                <el-radio v-model="form.is_urgent" :disabled="crud.status.edit" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否优先包装" prop="is_pri">
-                <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="1">是</el-radio>
+                <el-radio v-model="form.is_pri" :disabled="crud.status.edit" label="1">是</el-radio>
-                <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="0">否</el-radio>
+                <el-radio v-model="form.is_pri" :disabled="crud.status.edit" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -238,6 +245,7 @@
     </div>
     <MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
     <DeviceDialog :dialog-show.sync="deviceShow" :is-single="true" @tableChanged="tableChanged" />
+    <BOMDtl :dialog-show.sync="bomShow" :is-single="true" @setBOMValue="setBOMValue" />
     <ViewDialog ref="child3" />
     <!--表单组件-->
     <el-dialog
@@ -251,9 +259,10 @@
           <el-col :span="12">
             <el-form-item label="实际数量" prop="material_id">
               <el-input-number
-                style="width: 150px"
                 v-model="orderData.qty"
-                :min="0"/>
+                style="width: 150px"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,9 +270,10 @@
           <el-col :span="12">
             <el-form-item label="合格数量" prop="qualified_qty">
               <el-input-number
-                style="width: 150px"
                 v-model="orderData.qualified_qty"
-                :min="0"/>
+                style="width: 150px"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -271,9 +281,10 @@
           <el-col :span="12">
             <el-form-item label="不合格数量" prop="unqualified_qty">
               <el-input-number
-                style="width: 150px"
                 v-model="orderData.unqualified_qty"
-                :min="0"/>
+                style="width: 150px"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -296,6 +307,7 @@ import pagination from '@crud/Pagination'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import ViewDialog from '@/views/wms/pdm/workerorder/ViewDialog'
 import DeviceDialog from '@/views/wms/pub/DeviceDialog'
+import BOMDtl from '@/views/wms/pub/BOMDialog.vue'
 
 const defaultForm = {
   workorder_id: null,
@@ -346,7 +358,7 @@ const defaultForm = {
 }
 export default {
   name: 'Produceshiftorder',
-  components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
+  components: { BOMDtl, pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['pdm_workorder_status', 'priority_direction', 'is_used', 'is_or_not', 'material_type', 'vehicle_type', 'workorder_procedure', 'true_or_false', 'wood_vehicle_type'],
   cruds() {
@@ -371,6 +383,7 @@ export default {
       materType: '01',
       materialShow: false,
       deviceShow: false,
+      bomShow: false,
       workprocedureList: [],
       order_status: ['-1'],
       permission: {},
@@ -458,6 +471,10 @@ export default {
       this.form.device_name = row.device_name
       this.form.region_code = row.region_code
     },
+    setBOMValue(row) {
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+    },
     // 下发
     submits(row) {
       crudWorkorder.submits({ workorder_id: row.workorder_id }).then(res => {

lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue

@@ -0,0 +1,202 @@
+<template>
+  <el-dialog
+    title="BOM选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="90px"
+      label-suffix="："
+    >
+      <el-form-item label="BOM编码">
+        <el-input
+          v-model="query.name"
+          clearable
+          placeholder="BOM编码"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="standing_time" label="静置时间" :min-width="flexWidth('standing_time',crud.data,'静置时间')" />
+      <el-table-column prop="threshold_time" label="阈值时间" :min-width="flexWidth('threshold_time',crud.data,'阈值时间')" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="info" @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudMaterialbase from '@/api/wms/basedata/materialbase'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/classstandard'
+
+export default {
+  name: 'BOMDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: 'BOM',
+      url: 'api/Materialbase',
+      crudMethod: { ...crudMaterialbase },
+      optShow: {},
+      query: {
+        material_type: '2'
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    materOptCode: {
+      type: String,
+      default: '00'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      const param = {
+        'materOpt_code': this.materOptCode
+      }
+      crudMaterialbase.getMaterOptType(param).then(res => {
+        this.class_idStr = res.class_idStr
+        this.crud.query.class_idStr = res.class_idStr
+        this.crud.toQuery()
+        this.queryClassId()
+      })
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        if (val.length > 1) {
+          this.$refs.table.clearSelection()
+          this.$refs.table.toggleRowSelection(val.pop())
+        } else {
+          this.checkrow = row
+        }
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('setBOMValue', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先选择物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('setBOMValue', this.rows)
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue

@@ -46,8 +46,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-      <el-table-column prop="standing_time" label="静置时间" :min-width="flexWidth('standing_time',crud.data,'静置时间')" />
-      <el-table-column prop="threshold_time" label="阈值时间" :min-width="flexWidth('threshold_time',crud.data,'阈值时间')" />
       <el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
       <el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
       <el-table-column prop="b" label="短边长度" :min-width="flexWidth('b',crud.data,'短边长度')" />
@@ -77,7 +75,15 @@ export default {
   name: 'MaterDtl',
   components: { rrOperation, pagination },
   cruds() {
-    return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
+    return CRUD({
+      title: '物料',
+      url: 'api/Materialbase',
+      crudMethod: { ...crudMaterialbase },
+      optShow: {},
+      query: {
+        material_type: '1'
+      }
+    })
   },
   mixins: [presenter(), header()],
   dicts: ['product_series'],

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -145,7 +145,7 @@
               v-model="form.region_id"
               placeholder="请选择"
               style="width: 300px"
-              clearable
+              filterable
               @change="getPointStatusAndTypeList(form.region_id, 2)"
               @clear="pointTypesDialogList = null"
             >
@@ -162,6 +162,7 @@
               v-model="form.point_type"
               placeholder="点位类型"
               style="width: 300px"
+              filterable
             >
               <el-option
                 v-for="item in pointTypesDialogList"
@@ -176,7 +177,7 @@
               v-model="form.point_status"
               placeholder="点位状态"
               style="width: 300px"
-              clearable
+              filterable
             >
               <el-option
                 v-for="item in dict.point_status"
@@ -191,6 +192,7 @@
               v-model="form.lock_type"
               placeholder="锁定类型"
               style="width: 300px"
+              filterable
             >
               <el-option
                 v-for="item in dict.lock_type"
@@ -205,6 +207,7 @@
               v-model="form.vehicle_type"
               placeholder="载具类型"
               style="width: 300px"
+              filterable
               clearable
             >
               <el-option