Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

2022-07-13 10:42:00 +08:00
parent 0c831cd1a0 793ae06319
commit e592ee1e86
13 changed files with 384 additions and 84 deletions
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -29,8 +29,8 @@
        <!--       Excel打印-->
        <dependency>
            <groupId>e-iceblue</groupId>
-            <artifactId>spire.xls</artifactId>
-            <version>4.9.0</version>
+            <artifactId>spire.xls.free</artifactId>
+            <version>5.1.0</version>
        </dependency>
        <!--       二维码生成-->
        <dependency>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
@@ -143,6 +143,7 @@ public class WorkTaskServiceImpl implements WorkTaskService {
        Long currentUserId = SecurityUtils.getCurrentUserId();
        String nickName = SecurityUtils.getNickName();
        String now = DateUtil.now();
+        WQLObject em_bi_deviceinfo = WQLObject.getWQLObject("em_bi_deviceinfo");
        WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); // 工艺路线主表
        WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工艺路线主表
        WQLObject PDM_BI_WorkTaskJob = WQLObject.getWQLObject("PDM_BI_WorkTaskJob"); // 工艺路线主表
@@ -161,6 +162,19 @@ public class WorkTaskServiceImpl implements WorkTaskService {
            if (StrUtil.isEmpty(device_id)) {
                throw new BadRequestException(jo.getString("worktask_code") + "当前记录未指定设备！");
            }
+            String workprocedure_code = jsonMst.getString("workprocedure_code");
+            if("GX002".contains(workprocedure_code)){
+                JSONArray others = mstTab.query("worktask_id<>'"+worktask_id+"' and device_id='"+device_id+"' and status in('30')").getResultJSONArray(0);
+                if(others.size()>0){
+                    throw new BadRequestException(jo.getString("worktask_code") + "指定设备有其它已开始生产但未完成任务！");
+                }
+
+            }
+            JSONObject device = em_bi_deviceinfo.query("is_delete='0' and device_id='"+device_id+"'").uniqueResult(0);
+
+           if(!workprocedure_code.equals(device.getString("workprocedure_code"))){
+               throw new BadRequestException(jo.getString("worktask_code") + "指定设备所属工序与当前工序任务不一致！");
+           }
            //更新任务
            HashMap<String, String> map = new HashMap<>();
            map.put("status", "30");
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
@@ -3653,6 +3653,7 @@ public class AutoformulaServiceImpl implements AutoformulaService {
    @Override
    public void autoAll(JSONObject map) {
        WQLObject MD_ME_ProductMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt");
+        WQLObject pdm_bi_workprocedureparaproduct = WQLObject.getWQLObject("pdm_bi_workprocedureparaproduct");
        WQLObject md_me_materialbase = WQLObject.getWQLObject("md_me_materialbase");
        WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder");
        JSONArray rows = map.getJSONArray("rows");
@@ -3665,14 +3666,21 @@ public class AutoformulaServiceImpl implements AutoformulaService {
            if(workorder == null){
                throw new BadRequestException("当前工令信息查询失败！");
            }
+
            JSONObject result = new JSONObject();
            if("20".equals(workorder.getString("status"))){
                JSONObject material =  MD_ME_ProductMaterialExt.query("material_id ='"+material_id+"'").uniqueResult(0);
                if(material == null ){
                    throw new BadRequestException("当前成品查询不到成品物料扩展信息！");
                }
+                JSONObject materPa = pdm_bi_workprocedureparaproduct.query("para_code ='QM008' and workprocedure_code='GX002' and material_id ='"+material_id+"'").uniqueResult(0);
+
+                if(materPa == null ){
+                    throw new BadRequestException("当前成品查询不到球磨工艺参数球磨时间！");
+                }
                JSONObject mater =  md_me_materialbase.query("material_id ='"+material_id+"'").uniqueResult(0);
                workorder.put("formula_type","01");
+                workorder.put("ball_time",materPa.getDouble("value"));
                workorder.put("waste_limit_down","0");
                workorder.put("waste_limit_up","0");
                workorder.put("c_balance",material.getString("c_balance"));
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
@@ -500,15 +500,28 @@ public class FormulaServiceImpl implements FormulaService {
        JSONObject json98jj = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM001'").uniqueResult(0);
        JSONObject json92jj = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM002'").uniqueResult(0);

+        // 生成二维码
+        String create_time = jsonWork.getString("create_time");
+        BarcodeFormat qrCode = BarcodeFormat.QR_CODE;
+        BufferedImage imageCode = QrCodeUtil.generate(jsonWork.getString("workorder_id")+"#"+jsonMater.getString("ext_id")+"#"+jsonWork.getString("pcsn")+"#"+jsonWork.getString("workorder_qty")+"#"+create_time.substring(0,10), qrCode, 60, 60);
+        Workbook workbook = new Workbook();
+        // 获取模板地址
+        String template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("EXCEL_PATH").getValue();
+        String code_template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("CODE_EXCEL_PATH").getValue();
+
+        workbook.loadFromFile(template);
+        //获取第一张工作表并将二维码流put进去
+        Worksheet worksheet = workbook.getWorksheets().get(0);
+        worksheet.getPictures().add(1,1,imageCode);
+        workbook.saveToFile(code_template);
+
        // 设置文件名和防止乱码现象
        String fileName = URLEncoder.encode(jsonMater.getString("material_code")+"---"+jsonMst.getString("pcsn"), "UTF-8");
        response.setHeader("Content-Disposition", "attachment; filename*=UTf-8''"+fileName+".xlsx");
        // 获取输出流
        ServletOutputStream outputStream = response.getOutputStream();
-        String template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("EXCEL_PATH").getValue();
-//        String template = "D:\\work\\工艺控制卡模板.xlsx";
        // 创建模板工作簿
-        ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(template).build();
+        ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(code_template).build();
        // 获取第一个sheet
        WriteSheet sheet = EasyExcel.writerSheet().build();

@@ -569,31 +582,26 @@ public class FormulaServiceImpl implements FormulaService {
        }

        // 系列设备
-        JSONObject jsonWorkTask_QM = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX002'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonWorkTask_QM)) {
-            HashMap<String, String> map1 = new HashMap<>();
-            map1.put("flag", "3");
-            map1.put("product_series_id", jsonWorkTask_QM.getString("product_series_id"));
-            map1.put("workprocedure_id", jsonWorkTask_QM.getString("workprocedure_id"));
-            JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
-            map1.put("flag", "4");
-            JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
-                String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
-                String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
-                oneMap.put("device1", device_code_1 + "-" + device_code_2);
-            }
+        HashMap<String, String> map1 = new HashMap<>();
+        map1.put("flag", "3");
+        map1.put("product_series_id", jsonMst.getString("product_series_id"));
+        map1.put("workprocedure_id", "1472449856613257216");
+        JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+        map1.put("flag", "4");
+        JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
+            String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
+            String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
+            oneMap.put("device1", device_code_1 + "-" + device_code_2);
        }

-        JSONObject jsonWorkTask_PW = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX003'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonWorkTask_PW)) {
-            HashMap<String, String> map2 = new HashMap<>();
-            map2.put("flag", "5");
-            map2.put("product_series_id", jsonWorkTask_PW.getString("product_series_id"));
-            map2.put("workprocedure_id", jsonWorkTask_PW.getString("workprocedure_id"));
-            JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name"));
-        }
+        HashMap<String, String> map2 = new HashMap<>();
+        map2.put("flag", "5");
+        map2.put("product_series_id", jsonMst.getString("product_series_id"));
+        map2.put("workprocedure_id", "1472449923327856640");
+        JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name"));
+

        // 球磨
        oneMap.put("ball_speed", jsonMaterExt.getString("ball_speed"));
@@ -797,9 +805,10 @@ public class FormulaServiceImpl implements FormulaService {

        //设置相关打印选项
        Paper paper = pageFormat.getPaper();
-//        paper.setImageableArea(0, 0, pageFormat.getWidth(), pageFormat.getHeight());
-        paper.setSize(1240,1754);
-        paper.setImageableArea(0, 0, 1240, 1754);
+        paper.setImageableArea(0, 0, pageFormat.getWidth(), pageFormat.getHeight());
+//        paper.setSize(1240,1754);
+        paper.setSize(595,842);
+//        paper.setImageableArea(0, 0, 1240, 1754);
        pageFormat.setPaper(paper);
        printerJob.setCopies(1);
        printerJob.setPrintable(workbook, pageFormat);
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
@@ -117,6 +117,7 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                setJson.put("set_material_id", (String) json.getString("material_id"));
                setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
+                setJson.put("add_rate", json.getString("add_rate"));
                setTab.insert(setJson);
            }
        } else {
@@ -141,6 +142,7 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                setJson.put("set_material_id", (String) json.getString("material_id"));
                setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
+                setJson.put("add_rate", json.getString("add_rate"));
                setTab.insert(setJson);
            }
        }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
@@ -99,6 +99,7 @@
 			    mset.set_type,
 			    mset.set_prior_level,
 			    mset.is_calculate_forming,
+			    mset.add_rate,
 			    c.class_name,
 			    ext.old_mark
            FROM
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
@@ -89,6 +89,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
        if (StrUtil.isNotEmpty(map.get("material_code"))) {
            map.put("material_code", "%" + map.get("material_code") + "%");
        }
+        if (StrUtil.isNotEmpty(map.get("username"))) {
+            map.put("username", "%" + map.get("username") + "%");
+        }
        if (StrUtil.isNotEmpty(map.get("pcsn"))) {
            map.put("pcsn", "%" + map.get("pcsn") + "%");
        }
@@ -100,6 +103,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
        if (StrUtil.isNotEmpty(end_time)) {
            map.put("end_time", end_time.substring(0,10)+" 23:59:59");
        }
+        String source_bill_code = map.get("source_bill_code");
+        if (StrUtil.isNotEmpty(source_bill_code)) {
+            StringBuilder sb = new StringBuilder();
+            String[] strs = source_bill_code.split(",");
+            for(int i=0;i<strs.length;i++){
+                sb.append(",'" + strs[i] + "'");
+            }
+            String str = sb.toString();
+            str = "(" + str.substring(1) + ")";
+            map.put("source_bill_code", str);
+        }
        JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iosdtl2.material_id");
        return jo;
    }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
@@ -16,7 +16,7 @@
 	输入.flag					        TYPEAS s_string
    输入.bill_status					    TYPEAS s_string
 	输入.bill_code					    TYPEAS s_string
-	输入.source_bill_code					    TYPEAS s_string
+	输入.source_bill_code					    TYPEAS f_string
 	输入.username					    TYPEAS s_string
 	输入.create_mode					    TYPEAS s_string
 	输入.bill_type					    TYPEAS s_string
@@ -632,21 +632,22 @@
                			ST_IVT_IOStorInvDtl iosdtl
                		LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
                		LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
+                		LEFT JOIN sys_user user ON ios.input_optid = user.user_id
                		WHERE
                			1 = 1
                		AND ios.is_delete = '0'
                		AND ios.bill_type in ('010301','010302')
-                        OPTION 输入.remark <> ""
-                             (mb.material_code like 输入.remark or mb.material_name like 输入.remark)
+                        OPTION 输入.material_code <> ""
+                             (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
                       ENDOPTION
                        OPTION 输入.username <> ""
-                            (ios.input_optid = 输入.username or ios.input_optname = 输入.username)
+                            (user.username like 输入.username or ios.input_optname like 输入.username)
                      ENDOPTION
                        OPTION 输入.pcsn <> ""
                            iosdtl.pcsn like 输入.pcsn
                      ENDOPTION
                       OPTION 输入.source_bill_code <> ""
-                               iosdtl.source_bill_code = 输入.source_bill_code
+                               iosdtl.source_bill_code in 输入.source_bill_code
                       ENDOPTION
                       OPTION 输入.begin_time <> ""
                           ios.biz_date >= 输入.begin_time
--- a/mes/qd/src/views/wms/pf/formula/PicDialog.vue
+++ b/mes/qd/src/views/wms/pf/formula/PicDialog.vue
@@ -15,7 +15,7 @@
 <!--        <el-input v-model="query.formula_id" clearable size="mini" placeholder="物料id" disabled style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
      </div>
      <crudOperation :permission="permission">
-        <el-button
+<!--        <el-button
          slot="right"
          class="filter-item"
          type="warning"
@@ -26,7 +26,7 @@
          @click="printCard"
        >
          打印
-        </el-button>
+        </el-button>-->
      </crudOperation>
    </div>
    <!--表格渲染-->
--- a/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue
+++ b/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue
@@ -96,6 +96,11 @@
          </el-select>
        </template>
      </el-table-column>
+      <el-table-column prop="add_rate" label="允许添加量" align="center">
+        <template slot-scope="scope">
+          <el-input-number v-model="form.tableData[scope.$index].add_rate" :precision="2" :step="0.1" :max="100" :min="0" :placeholder="100.00" :controls="false"></el-input-number>
+        </template>
+      </el-table-column>
      <el-table-column v-permission="['admin','receivemst:edit','receivemst:del']" label="操作" width="80px" align="center">
        <template slot-scope="scope">
          <el-button
--- a/mes/qd/src/views/wms/statistics/outStorQuery/StructIvt.vue
+++ b/mes/qd/src/views/wms/statistics/outStorQuery/StructIvt.vue
@@ -0,0 +1,269 @@
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @open="open"
+  >
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">工令查询</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="submit">关闭</el-button>
+          <el-button slot="left" type="primary" @click="submit">确定</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="head-container">
+      <div >
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="120px"
+          label-suffix=":"
+        >
+          <el-form-item label="工令号">
+            <el-input
+              v-model="query.workorder_code"
+              size="mini"
+              clearable
+              placeholder="工令号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="产品">
+            <el-input
+              v-model="query.material_id"
+              size="mini"
+              clearable
+              placeholder="物料编码或物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工令日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              @input="onInput()"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工令类型">
+            <el-select
+              v-model="query.workorder_type"
+              clearable
+              size="mini"
+              placeholder="工令类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.workorder_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="工令状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="工令状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.workorder_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="所属组织">
+            <el-select
+              v-model="query.org_id"
+              clearable
+              size="mini"
+              placeholder="所属组织"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in Depts"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-input
+              v-model="query.pcsn"
+              size="mini"
+              clearable
+              placeholder="批次"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="workorder_date" min-width="85" label="工令日期" :formatter="workorder_dateFormat"/>
+        <el-table-column prop="workorder_code" width="130" label="工令号" />
+        <el-table-column prop="org_id" :formatter="orgFormat" min-width="110" label="所属组织" />
+        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="80" label="工令类型" />
+        <el-table-column  :formatter="stateFormat" min-width="80" prop="status" label="工令状态" />
+        <el-table-column prop="material_code" min-width="130" label="物料编码"/>
+        <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
+        <el-table-column prop="pcsn" min-width="80" label="批次"/>
+        <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="bill_qty" min-width="80" label="开单总重量" :formatter="crud.formatNum3" />
+        <el-table-column prop="productin_qty" min-width="100" label="实际生产重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="qty_unit_name" min-width="80" label="单位"/>
+        <el-table-column prop="remark" min-width="120" label="备注"/>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </el-dialog>
+</template>
+<script>
+
+import workorder from '@/api/wms/pdm/workorder'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
+import Date from "@/utils/datetime";
+import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+
+export default {
+  name: 'StrctIvt',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '工令', idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['workorder_status', 'workorder_type', 'product_series'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'workorder:add'],
+        edit: ['admin', 'workorder:edit'],
+        del: ['admin', 'workorder:del']
+      },
+      dialogVisible: false,
+      XLList: [],
+      Depts: [],
+      workProcedureList: [],
+      checkrows: []
+    }
+  },
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudseriesProcessRoute.getXLlist2().then(res => {
+      this.XLList = res
+    })
+    crudWorkProcedure.downSelect().then(res => {
+      this.workProcedureList = res
+    })
+    workorder.getDepts().then(res => {
+      this.Depts = res
+    })
+  },
+  methods: {
+    open() {
+      this.crud.query.createTime = [new Date(), new Date().daysLater(1)]
+      this.crud.toQuery()
+    },
+    stateFormat(row) {
+      return this.dict.label.workorder_status[row.status]
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.workorder_type[row.workorder_type]
+    },
+    seriesFormat(row) {
+      for (const item of this.XLList) {
+        if (item.id === row.product_series_id) {
+          return item.name
+        }
+      }
+    },
+    orgFormat(row) {
+      for (const item of this.Depts) {
+        if (item.id === row.org_id) {
+          return item.name
+        }
+      }
+    },
+    workorder_dateFormat(row) {
+      return row.planstart_time.substring(0, 10)
+    },
+    onInput() {
+      this.$forceUpdate()
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      this.$emit('update:dialogShow', false)
+      this.$emit('StructIvtClosed', this.rows)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
--- a/mes/qd/src/views/wms/statistics/outStorQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/outStorQuery/index.vue
@@ -58,15 +58,6 @@
              @change="crud.toQuery"
            />
          </el-form-item>
-          <el-form-item label="工令">
-            <el-input
-              v-model="query.source_bill_code"
-              size="mini"
-              clearable
-              placeholder="工令"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
          <el-form-item label="物料">
            <el-input
              v-model="query.material_code"
@@ -85,6 +76,11 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
+          <el-form-item label="工令">
+            <el-input v-model="query.source_bill_code"  size="mini" placeholder="工令号" disabled class="input-with-select">
+              <el-button slot="append" icon="el-icon-search" @click="queryMater" />
+            </el-input>
+          </el-form-item>
          <el-form-item label="人员">
            <el-input
              v-model="query.username"
@@ -109,9 +105,6 @@
        style="width: 100%;"
        :highlight-current-row="true"
        @selection-change="crud.selectionChangeHandler"
-        @current-change="handleCurrentChange"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
      >
        <el-table-column type="index" label="序号" width="50" align="center" />
        <el-table-column prop="material_code" label="物料编码" width="150" align="center" />
@@ -127,6 +120,7 @@
      <!--分页组件-->
      <pagination />
    </div>
+    <StructIvt :dialog-show.sync="structshow" @StructIvtClosed="queryTableDtl" />
  </div>
 </template>

@@ -138,11 +132,12 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
 import Date from '@/utils/datetime'
+import StructIvt from '@/views/wms/statistics/outStorQuery/StructIvt'
 import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'

 export default {
  name: 'outStorQuery',
-  components: { crudOperation, rrOperation, pagination },
+  components: { StructIvt, crudOperation, rrOperation, pagination },
  cruds() {
    return CRUD({ title: '生产配粉领料', idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill },
      optShow: {
@@ -161,11 +156,8 @@ export default {
      height: document.documentElement.clientHeight - 180 + 'px;',
      permission: {
      },
-      divShow: false,
-      openParam: [],
-      mstrow: {},
+      structshow: false,
      currentRow: null,
-      checkrows: [],
      storlist: [],
      billtypelist: []
    }
@@ -187,31 +179,11 @@ export default {
    this.crud.toQuery()
  },
  methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.handleCurrentChange(null)
-    },
    onInput() {
      this.$forceUpdate()
    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-        this.buttonChange(row)
-      } else if (val.length === 1) {
-        this.buttonChange(row)
-      } else {
-        this.handleCurrentChange(null)
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-      this.handleCurrentChange(null)
-    },
-    buttonChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-      }
+    async queryMater() {
+      this.structshow = true
    },
    quality_scodeFormat(row, column) {
      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
@@ -222,14 +194,19 @@ export default {
    is_activeFormat(row, column) {
      return this.dict.label.is_usable[row.is_active]
    },
-    handleCurrentChange(current) {
-      if (current === null) {
-        this.currentRow = {}
+    queryTableDtl(rows) {
+      let devices = ''
+      for (let i = 0; i < rows.length; i++) {
+        if ( i === 0 ) {
+          devices = rows[i].workorder_code
+        }else{
+          devices = devices + ',' + rows[i].workorder_code
+        }
+      }
+      if(rows.length > 0){
+        this.crud.query.source_bill_code = devices
+        this.crud.toQuery()
      }
-    },
-    querytable() {
-      this.crud.toQuery()
-      this.handleCurrentChange(null)
    }
  }
 }