优化

mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java

@@ -347,7 +347,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
         }
         JSONObject jo_now = WQL.getWO("QPADST_IN_SERVICE").addParam("flag", "11").addParam("storagevehicle_code", storagevehicle_code).process().uniqueResult(0);
         if(jo_now!=null){
-            throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的入库单！");
+            throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的出入库单！");
         }
         JSONObject mst_jo = new JSONObject();
         String bill_code = CodeUtil.getNewCode("IO_CODE");

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java

@@ -94,6 +94,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         String now = DateUtil.now();
 
         String storagevehicle_type = (String) map.get("storagevehicle_type");
+        String is_used = (String) map.get("is_used");
         String code = "";
         switch (storagevehicle_type) {
             case "10":
@@ -128,6 +129,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
             dto.setUpdate_optname(nickName);
             dto.setUpdate_time(now);
             dto.setCreate_time(now);
+            dto.setIs_used(is_used);
             dto.setStoragevehicle_type((String) map.get("storagevehicle_type"));
             JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
             wo.insert(json);

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java

@@ -288,6 +288,20 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
             dto.setUpdate_time(DateUtil.now());
             dto.setRemark(remark);
             if(StrUtil.isNotEmpty(device_code) && !"null".equals(device_code)){
+
+                JSONObject jsonMater2 = MD_ME_ProducMaterialExt.query("material_id = '" + jsonMater.getString("material_id") + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(jsonMater2)) {
+                    throw new BadRequestException("此【" + material_code + "】物料未配置成品物料扩展信息");
+                }
+                String product_series = jsonMater2.getString("product_series");
+                if(StrUtil.isNotEmpty(product_series)){
+                    JSONObject device = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag", "33").addParam("product_series", product_series).addParam("device_code", device_code).process().uniqueResult(0);
+                    if(device==null){
+                        throw new BadRequestException("此【" + material_code + "】物料系列排产设备不包含"+device_code);
+                    }
+                }else{
+                    throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性");
+                }
                 JSONObject device = em_bi_deviceinfo.query("is_delete='0' and is_active='1' and device_code='"+device_code+"'").uniqueResult(0);
                 if(device!=null){
                     dto.setDevice_id(device.getLong("device_id"));
@@ -303,6 +317,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                     if(device!=null){
                         dto.setDevice_id(device.getLong("id"));
                     }
+                }else{
+                    throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性");
                 }
             }
             dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE"));

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

@@ -94,7 +94,7 @@
                  OPTION 输入.device_id <> ""
                         pp.device_id = 输入.device_id
                 ENDOPTION
-                order by pp.planstart_date,pp.plan_code
+                order by pp.planend_date,materialbase.material_code
             ENDSELECT
         ENDQUERY
     ENDIF

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

@@ -17,6 +17,7 @@
 	输入.product_type_name			    TYPEAS s_string
 	输入.plan_month					    TYPEAS s_string
 	输入.material_code					TYPEAS s_string
+	输入.device_code					TYPEAS s_string
 	输入.task_code					    TYPEAS s_string
 	输入.is_proc					        TYPEAS s_string
 	输入.plan_org_code					TYPEAS s_string
@@ -172,6 +173,9 @@
                  OPTION 输入.product_series <> ""
                        WorkDevice.product_series_id = 输入.product_series
                 ENDOPTION
+                OPTION 输入.device_code <> ""
+                       deviceinfo.device_code = 输入.device_code
+                ENDOPTION
                 order by deviceinfo.device_code asc
             ENDSELECT
         ENDQUERY

mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java

@@ -87,7 +87,7 @@ public class TaskController {
         }
         //增加未完成状态
         JSONObject unFinish = new JSONObject();
-        unFinish.put("code", "-1");
+        unFinish.put("code", "11");
         unFinish.put("name", "未完成");
         arr.add(unFinish);
         return new ResponseEntity<>(arr, HttpStatus.OK);

mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -28,6 +28,7 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ldjun
@@ -47,16 +48,29 @@ public class TaskServiceImpl implements TaskService {
 
         JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form));
 
+        String task_status_old = whereJson.getString("task_status");
         String task_status = whereJson.getString("task_status");
-        if (StrUtil.isNotEmpty(task_status)) {
+
-            task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", "");
+        String task_status_new = "";
+        if (StrUtil.isNotEmpty(task_status) && !"null".equals(task_status)) {
+            task_status = task_status.replace("11","01,02,03");
+            String[] strs = task_status.split(",");
+            for( int i=0;i<strs.length;i++){
+                if(i==0){
+                    task_status_new = "('" +strs[i];
+                }else{
+                    task_status_new =task_status_new +"','"+strs[i];
+                }
+            }
+            task_status_new =task_status_new +"')";
+            map.put("task_status", task_status_new);
+        }else{
+            map.put("task_status", "");
         }
-        map.put("task_status", task_status);
         //处理状态为未完成
-        if (StrUtil.isNotEmpty(task_status) && task_status.contains("-1")) {
+        /*if (StrUtil.isNotEmpty(task_status) && task_status.contains("11")) {
-            map.put("unFinish", "-1");
+            map.put("unFinish", "11");
-            map.put("task_status", task_status.replace("-1", ""));
+        }*/
-        }
         if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) {
             map.put("task_code", "%" + whereJson.getString("task_code") + "%");
         }
@@ -85,6 +99,16 @@ public class TaskServiceImpl implements TaskService {
             map.put("end_time", whereJson.getString("end_time"));
         }
         JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
+
+        JSONArray array = json.getJSONArray("content");
+        String allmaterialId = " ";
+        if (ObjectUtil.isNotEmpty(array)){
+            allmaterialId = "(\""+array.stream().map(o -> ((JSONObject) o).getString("taskdtl_id")).collect(Collectors.joining("\",\""))+"\")";
+            map.put("flag", "2");
+            map.put("materialIds", allmaterialId);
+            JSONArray currentArray = WQL.getWO("QSCH_TASK_01").addParamMap(map).process().getResultJSONArray(0);
+            json.put("content",currentArray);
+        }
         return json;
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql

@@ -14,7 +14,7 @@
 	##			表字段对应输入参数
 	#################################################
 	输入.flag					                 TYPEAS s_string
-	输入.task_status					             TYPEAS s_string
+	输入.task_status					             TYPEAS f_string
 	输入.finished_type					         TYPEAS s_string
 	输入.task_type					             TYPEAS s_string
 	输入.start_point_code					     TYPEAS s_string
@@ -25,6 +25,7 @@
 	输入.end_time					             TYPEAS s_string
 	输入.unFinish					             TYPEAS s_string
 	输入.taskdtl_type					         TYPEAS s_string
+	输入.materialIds			            TYPEAS f_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -51,21 +52,9 @@
     IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-                    task.*,
+                    task.taskdtl_id
-                    p1.point_name AS start_point_name,
-                    d1.label AS start_area_name,
-                    p2.point_name AS next_point_name,
-                    d2.label AS next_area_name,
-                    d3.label AS task_type_name,
-                    d4.label AS taskdtl_type_name
                 FROM
                     sch_base_task task
-                LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code
-                LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type'
-                LEFT JOIN sch_base_point p2 ON task.next_point_code  = p2.point_code
-                LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type'
-                LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE'
-                LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL'
                 WHERE
                     task.is_delete = '0'
                     OPTION 输入.task_type <> ""
@@ -87,7 +76,7 @@
                             task.task_status <> '99'
                     ENDOPTION
                     OPTION 输入.task_status <> ""
-                            find_in_set( task.task_status, 输入.task_status)
+                            task.task_status in 输入.task_status
                     ENDOPTION
                     OPTION 输入.vehicle_code <> ""
                          (task.vehicle_code like 输入.vehicle_code)
@@ -110,3 +99,30 @@
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
+
+	IF 输入.flag = "2"
+        QUERY
+            SELECT
+                    task.*,
+                    p1.point_name AS start_point_name,
+                    d1.label AS start_area_name,
+                    p2.point_name AS next_point_name,
+                    d2.label AS next_area_name,
+                    d3.label AS task_type_name,
+                    d4.label AS taskdtl_type_name
+                FROM
+                    sch_base_task task
+                LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code
+                LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type'
+                LEFT JOIN sch_base_point p2 ON task.next_point_code  = p2.point_code
+                LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type'
+                LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE'
+                LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL'
+                WHERE
+                    task.is_delete = '0'
+                    OPTION 输入.materialIds <> ""
+                            task.taskdtl_id in 输入.materialIds
+                    ENDOPTION
+            ENDSELECT
+        ENDQUERY
+    ENDIF

mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue

@@ -4,6 +4,7 @@
     :visible.sync="dialogVisible"
     :show-close="false"
     @close="close"
+    @open="open"
   >
      <span slot="title" class="dialog-footer">
       <div class="crud-opts2">
@@ -173,11 +174,13 @@ export default {
     workorder.getDepts().then(res => {
       this.Depts = res
     })
-    producetask.getDevices().then(res => {
-      this.Devices = res
-    })
   },
   methods: {
+    open() {
+      producetask.getDevices({ product_series_id: this.form.product_series}).then(res => {
+        this.Devices = res
+      })
+    },
     close() {
       this.$emit('update:dialogShow', false)
       this.form = {}
@@ -185,7 +188,6 @@ export default {
     },
     submit() {
       producetask.submit3(this.form).then(res => {
-        debugger
         this.$emit('update:dialogShow', false)
         this.form = {}
         this.$emit('AddChanged')

mes/qd/src/views/wms/sch/task/index.vue

@@ -50,8 +50,8 @@
           </el-form-item>
           <el-form-item label="任务类型">
             <el-select
-              filterable
               v-model="query.task_type"
+              filterable
               style="width: 180px"
               placeholder="任务类型"
               class="filter-item"
@@ -67,8 +67,8 @@
           </el-form-item>
           <el-form-item label="任务明细">
             <el-select
-              filterable
               v-model="query.taskdtl_type"
+              filterable
               style="width: 180px"
               placeholder="任务类型"
               class="filter-item"
@@ -112,10 +112,9 @@
             </el-select>
           </el-form-item>
 
-
           <el-form-item label="任务状态">
             <el-select
-              v-model="query.task_status"
+              v-model="query.status"
               multiple
               style="width: 400px"
               placeholder="任务状态"
@@ -150,24 +149,20 @@
         <el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务编码" />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
-        <el-table-column prop="task_type_name" label="任务类型"  />
+        <el-table-column prop="task_type_name" label="任务类型" />
         <el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
         <el-table-column prop="taskdtl_type_name" label="任务明细" />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
-        <!--
-                <el-table-column v-if="false" prop="finished_type" label="完成方式" />
-        -->
-        <!--        <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
         <el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
         <el-table-column prop="start_point_code" label="起点编码" width="85" />
-        <el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip/>
+        <el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip />
         <el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
         <el-table-column prop="next_point_code" label="下一点编码" width="85" />
-        <el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
+        <el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
-        <el-table-column prop="update_by" label="修改者" v-if="false"/>
+        <el-table-column v-if="false" prop="update_by" label="修改者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
@@ -184,10 +179,6 @@
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
-                <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">重发</el-dropdown-item>-->
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -238,7 +229,7 @@ export default {
       sort: 'taskdtl_id,desc',
       crudMethod: { ...crudTask },
       query: {
-        task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
+        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', taskdtl_type: '', finished_type: '', task_status: '', status:''
       },
       optShow: {
         add: false,
@@ -257,9 +248,11 @@ export default {
       currentComponent: '',
       openParam: {},
       create_time: [],
+      task_status: [],
       taskStatusList: [],
       taskTypeList: [],
       finishTypeList: [],
+      flag1: true,
       permission: {
 
       },
@@ -276,16 +269,34 @@ export default {
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
-    this.crud.query.task_status = ['-1']
+    this.crud.query.status = ['11']
+    this.crud.query.task_status = '11'
     this.crud.toQuery()
   },
   methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.flag1) {
+        this.crud.query.status = ['11']
+        this.crud.query.task_status = '11'
+        this.flag1 = false
+      }
+    },
     hand(value) {
       this.crud.toQuery()
     },
     handTaskStatus(value) {
+      var str1 = ''
       if (value) {
-        this.query.task_status = this.task_status.toString()
+        for (const item of value) {
+          if (str1 === '') {
+            str1 = item
+          } else {
+            str1 = str1 + ',' + item
+          }
+        }
+        this.query.task_status = str1
+      } else {
+        this.query.task_status = ''
       }
       this.crud.toQuery()
     },