From ae3b3414880df0256d488016901a6bf79d44cc8d Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 30 Jun 2022 12:25:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8D=95=EF=BC=88=E6=96=B0=E6=96=99=E3=80=81=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=EF=BC=89=E5=8A=A0=E5=BA=93=E5=AD=98=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AutoformulaServiceImpl.java  |  20 ++
 .../org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql   |   6 +-
 .../core/outbill/wastewashoutbill/AddDtl.vue  | 182 ++++++++++++++++++
 3 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue

diff --git 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
index 658fd0f1..5a05ce31 100644
--- 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
@@ -464,12 +464,17 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                 String is_need_move = bomdlt.getString("is_need_move");
                 String bomdtl_material_id = bomdlt.getString("material_id");
                 String bomdtl_material_code = bomdlt.getString("material_code");
+                String prior_level = bomdlt.getString("prior_level");
+                if (StrUtil.isEmpty(prior_level)) {
+                    prior_level = "03";
+                }
                 if("1".equals(is_need_move)){
                     //查询库存
                     JSONArray bom_materials = WQL.getWO("QPF_AUTOFORMULA01")
                             .addParam("material_id",bomdtl_material_id)
                             .addParam("workorder_id",workorder_id)
                             .addParam("quality_scode","01")
+                            .addParam("prior_level",prior_level)
                             .addParam("flag","22")
                             .process().getResultJSONArray(0);
                     if(bom_materials.size()==0){
@@ -1308,12 +1313,17 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                     }
                     String is_need_move = bomdlt.getString("is_need_move");
                     String bomdtl_material_id = bomdlt.getString("material_id");
+                    String prior_level = bomdlt.getString("prior_level");
+                    if (StrUtil.isEmpty(prior_level)) {
+                        prior_level = "03";
+                    }
                     if(nedd_qty>0 && "1".equals(is_need_move)){
                         //查询库存
                         JSONArray bom_materials = WQL.getWO("QPF_AUTOFORMULA01")
                                 .addParam("material_id",bomdtl_material_id)
                                 .addParam("quality_scode","01")
                                 .addParam("workorder_id",workorder_id)
+                                .addParam("prior_level",prior_level)
                                 .addParam("flag","22")
                                 .process().getResultJSONArray(0);
                         if(bom_materials.size()==0){
@@ -2525,9 +2535,14 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                     //获取Y1、X1、X2….剩余>0的物料
                     if(left_qty>0){
                         if(is_need_move.equals("1")){
+                            String prior_level = bomdlt.getString("prior_level");
+                            if (StrUtil.isEmpty(prior_level)) {
+                                prior_level = "03";
+                            }
                             JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                                     .addParam("material_id",bomdtl_material_id)
                                     .addParam("quality_scode","01")
+                                    .addParam("prior_level",prior_level)
                                     .addParam("workorder_id",workorder_id)
                                     .addParam("flag","22")
                                     .process().getResultJSONArray(0);
@@ -3426,11 +3441,16 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                         String bomdtl_material_id = bomdlts_plan.getString("material_id");
                         double left_qty = bomdlts_plan.getDouble("formula_qty");
                         String is_need_move = bomdlts_plan.getString("is_need_move");
+                        String prior_level = bomdlts_plan.getString("prior_level");
+                        if (StrUtil.isEmpty(prior_level)) {
+                            prior_level = "03";
+                        }
                         if(is_need_move.equals("1")){
                             //二次分配新料库存
                             JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                                     .addParam("material_id",bomdtl_material_id)
                                     .addParam("quality_scode","01")
+                                    .addParam("prior_level",prior_level)
                                     .addParam("workorder_id",workorder_id)
                                     .addParam("flag","22")
                                     .process().getResultJSONArray(0);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
index 511cacef..54983e95 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					            TYPEAS s_string
 	输入.quality_scode					    TYPEAS s_string
+	输入.prior_level					    TYPEAS s_string
 	输入.material_id					TYPEAS s_string
 	输入.material_code					TYPEAS s_string
 	输入.is_need_manage					TYPEAS s_string
@@ -186,10 +187,13 @@
                       OPTION 输入.quality_scode <> ""
                          structivt.quality_scode =  输入.quality_scode
                       ENDOPTION
+                       OPTION 输入.prior_level <> ""
+                       structivt.ivt_level <=  输入.prior_level
+                        ENDOPTION
                        OPTION 输入.is_pure <> ""
                            stockmaterialext.is_pure =  输入.is_pure
                         ENDOPTION
-                       ORDER BY structivt.material_id,structivt.pcsn, structivt.sum_qty desc
+                       ORDER BY structivt.material_id,structivt.ivt_level desc,structivt.pcsn, structivt.sum_qty desc
                     ENDSELECT
             ENDQUERY
         ENDIF
diff --git a/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue
new file mode 100644
index 00000000..236d922e
--- /dev/null
+++ b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue
@@ -0,0 +1,182 @@
+<template>
+  <el-dialog
+    title="到货单物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1200px"
+    @open="open"
+    @close="close"
+  >
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.receive_code"
+        clearable
+        size="mini"
+        placeholder="订单编号"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="crud.toQuery"
+      />
+      <el-input
+        v-model="query.source_bill_code"
+        clearable
+        size="mini"
+        placeholder="到货单号"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="crud.toQuery"
+      />
+      <date-range-picker v-model="query.createTime" class="date-item" />
+      <el-select
+        v-model="query.status"
+        clearable
+        size="mini"
+        placeholder="单据状态"
+        class="filter-item"
+        style="width: 230px;"
+      >
+        <el-option
+          v-for="item in receiveStatusList"
+          :key="item.code"
+          :label="item.name"
+          :value="item.code"
+        />
+      </el-select>
+      <el-input
+        v-model="query.search"
+        clearable
+        size="mini"
+        placeholder="物料编码或名称"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="crud.toQuery"
+      />
+      <rrOperation />
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column show-overflow-tooltip prop="receive_code" width="150" label="订单编号" />
+      <el-table-column show-overflow-tooltip prop="base_bill_code" width="150" label="到货单号" />
+      <el-table-column show-overflow-tooltip prop="source_name" label="供应商" />
+      <el-table-column show-overflow-tooltip prop="material_code" width="150" label="物料编码" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
+      <el-table-column show-overflow-tooltip prop="receive_qty" :formatter="crud.formatNum3" width="120" label="到货重量" />
+      <el-table-column show-overflow-tooltip prop="instor_qty" :formatter="crud.formatNum3" label="入库重量" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="检测重量" />
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
+      <el-table-column show-overflow-tooltip prop="status" label="状态" :formatter="stateFormat" />
+      <el-table-column show-overflow-tooltip prop="input_optname" label="创建人" />
+      <el-table-column show-overflow-tooltip prop="receive_date" width="120" label="到货日期" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudReceivemst from '@/api/wms/pcs/receivemst'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({ title: '用户', url: 'api/returnoutbill/addDtl',
+      query: { receive_code: '', source_bill_code: '', status: '', search: '', mater_type: '' },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: false,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      receiveStatusList: [],
+      opendtlParam: '',
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  created() {
+    crudReceivemst.getStatus().then(res => {
+      this.receiveStatusList = res
+    })
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.mater_type = this.opendtlParam
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    open() {
+      this.crud.query.mater_type = this.opendtlParam
+      this.crud.toQuery()
+    },
+    stateFormat(row, column) {
+      for (const item of this.receiveStatusList) {
+        if (item.code === row.status) {
+          return item.name
+        }
+      }
+    },
+    submit() {
+      this.rows = this.$refs.multipleTable.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+

From 805db30284ec9d12e9a37c4aecad1eecfe2ac463 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 30 Jun 2022 12:26:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8D=95=EF=BC=88=E6=96=B0=E6=96=99=E3=80=81=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=EF=BC=89=E5=8A=A0=E5=BA=93=E5=AD=98=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/core/rest/ReturnOutBillController.java |   6 +
 .../st/core/service/ReturnOutBillService.java |   8 ++
 .../impl/ReturnOutBillServiceImpl.java        |  16 +++
 .../wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql |  54 +++++++++
 .../outbill/wastewashoutbill/AddDialog.vue    |  35 ++++--
 .../core/outbill/wastewashoutbill/AddDtl.vue  | 114 +++++++-----------
 6 files changed, 151 insertions(+), 82 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/ReturnOutBillController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/ReturnOutBillController.java
index 054839e2..0250a71d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/ReturnOutBillController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/ReturnOutBillController.java
@@ -47,4 +47,10 @@ public class ReturnOutBillController {
     public ResponseEntity<Object> queryBillDtl(@RequestParam Map whereJson, Pageable page){
         return new ResponseEntity<>(returnOutBillService.queryBillDtl(whereJson,page), HttpStatus.OK);
     }
+    @GetMapping("/queryWashDtl")
+    @Log("查询软废库存")
+    @ApiOperation("查询软废库存")
+    public ResponseEntity<Object> queryWashDtl(@RequestParam Map whereJson, Pageable page){
+        return new ResponseEntity<>(returnOutBillService.queryWashDtl(whereJson,page), HttpStatus.OK);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/ReturnOutBillService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/ReturnOutBillService.java
index 5d4045e0..59753fdb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/ReturnOutBillService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/ReturnOutBillService.java
@@ -30,4 +30,12 @@ public interface ReturnOutBillService {
      * @return Map<String, Object>
      */
     Map<String, Object> queryBillDtl(Map whereJson, Pageable page);
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> queryWashDtl(Map whereJson, Pageable page);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/ReturnOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/ReturnOutBillServiceImpl.java
index 8fd0f23e..3f65b410 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/ReturnOutBillServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/ReturnOutBillServiceImpl.java
@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.utils.SpringContextHolder;
+import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
 import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.st.core.service.ReturnOutBillService;
 import org.nl.wql.WQL;
@@ -161,4 +162,19 @@ public class ReturnOutBillServiceImpl implements ReturnOutBillService {
         return jo;
     }
 
+    @Override
+    public Map<String, Object> queryWashDtl(Map whereJson, Pageable page) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        if (StrUtil.isNotEmpty(map.get("search"))) {
+            map.put("search", "%" + map.get("search") + "%");
+        }
+        if (StrUtil.isNotEmpty(map.get("pcsn"))) {
+            map.put("pcsn", "%" + map.get("pcsn") + "%");
+        }
+        map.put("flag", "4");
+        map.put("material_ids", MaterOptTypeEnum.RF.getClass_idStr());
+        JSONObject jo = WQL.getWO("QST_IVT_RETURNOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_id desc");
+        return jo;
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql
index d5756f22..e170d999 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql
@@ -23,9 +23,11 @@
     输入.mater_type				        TYPEAS f_string
     输入.query_type				        TYPEAS s_string
     输入.searchid				        TYPEAS s_string
+    输入.is_active				        TYPEAS s_string
     输入.bucketunique				    TYPEAS s_string
     输入.pcsn				            TYPEAS s_string
     输入.storagevehicle_code				TYPEAS s_string
+    输入.material_ids					TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
 
@@ -216,3 +218,55 @@
                 ENDSELECT
             ENDPAGEQUERY
     ENDIF
+
+     IF 输入.flag = "4"
+            PAGEQUERY
+                SELECT
+                	structivt.*,
+                	mb.material_name,
+                	mb.material_code,
+                	'' AS remark
+                FROM
+                	(
+                	SELECT
+                		SUM( ivt.canuse_qty ) AS plan_qty,
+                		SUM( ivt.ivt_qty ) AS sum_qty,
+                		ivt.qty_unit_id,
+                		ivt.qty_unit_name,
+                		ivt.material_id,
+                		ivt.pcsn,
+                		ivt.is_active,
+                		ivt.ivt_level,
+                		ivt.quality_scode
+                	FROM
+                		st_ivt_structivt ivt
+                	GROUP BY
+                		ivt.material_id,
+                		ivt.pcsn,
+                		ivt.is_active,
+                		ivt.ivt_level,
+                		ivt.quality_scode,
+                		ivt.qty_unit_id,
+                		ivt.qty_unit_name
+                	) structivt
+                	LEFT JOIN md_me_materialbase mb ON mb.material_id = structivt.material_id
+                WHERE
+                	1 = 1
+                	AND structivt.plan_qty > 0
+                    OPTION 输入.search <> ""
+                        (mb.material_code like 输入.search
+                        OR
+                        mb.material_name like 输入.search)
+                    ENDOPTION
+                    OPTION 输入.pcsn <> ""
+                        structivt.pcsn like 输入.pcsn
+                    ENDOPTION
+                    OPTION 输入.is_active <> ""
+                        structivt.is_active = 输入.is_active
+                    ENDOPTION
+                     OPTION 输入.material_ids <> ""
+                         mb.material_type_id in  输入.material_ids
+                     ENDOPTION
+                ENDSELECT
+            ENDPAGEQUERY
+    ENDIF
diff --git a/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDialog.vue
index 86c4c888..ae7eec29 100644
--- a/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDialog.vue
@@ -108,6 +108,16 @@
       <span v-if="crud.status.cu > 0" class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
+          <el-button
+            slot="left"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="queryDtl()"
+          >
+          添加库存物料
+        </el-button>
         <el-button
           slot="left"
           class="filter-item"
@@ -140,7 +150,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center">
+      <el-table-column show-overflow-tooltip prop="pcsn" width="120" label="批次号" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
@@ -218,6 +228,7 @@
         </template>
       </el-table-column>
     </el-table>
+    <AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
     <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
   </el-dialog>
 </template>
@@ -225,6 +236,7 @@
 <script>
 import CRUD, { crud, form } from '@crud/crud'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
+import AddDtl from '@/views/wms/st/core/outbill/wastewashoutbill/AddDtl'
 import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
 import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
@@ -245,7 +257,7 @@ const defaultForm = {
 }
 export default {
   name: 'AddDialog',
-  components: { MaterDialog },
+  components: { AddDtl, MaterDialog },
   mixins: [crud(), form(defaultForm)],
   props: {
     dialogShow: {
@@ -260,6 +272,7 @@ export default {
       materType: '',
       materShow: false,
       flagnow: false,
+      dtlShow: false,
       nowrow: {},
       nowindex: '',
       storlist: [],
@@ -354,6 +367,7 @@ export default {
       })
     },
     tableChanged(rows) {
+      // 插入第一条
       const tablemap = new Map()
       rows.forEach((item) => {
         if (this.form.tableData.length !== 0) {
@@ -364,18 +378,12 @@ export default {
             }
           }
           if (!this.flagnow) {
-            item.edit = true
-            item.quality_scode = '02'
-            item.ivt_level = '01'
-            item.is_active = '0'
+            item.edit = false
             item.bill_status = '10'
             tablemap.set(item.material_id, item)
           }
         } else {
-          item.edit = true
-          item.quality_scode = '02'
-          item.ivt_level = '01'
-          item.is_active = '0'
+          item.edit = false
           item.bill_status = '10'
           tablemap.set(item.material_id, item)
         }
@@ -385,6 +393,13 @@ export default {
       }
       this.form.detail_count = this.form.tableData.length
     },
+    async queryDtl() {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.dtlShow = true
+    },
     tableChanged2(row) {
       for (let i = 0; i < this.form.tableData.length; i++) {
         if (this.form.tableData[i].material_id === row.material_id) {
diff --git a/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue
index 236d922e..ca3bdbfa 100644
--- a/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/AddDtl.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="到货单物料选择"
+    title="库存物料选择"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
@@ -12,40 +12,6 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.receive_code"
-        clearable
-        size="mini"
-        placeholder="订单编号"
-        style="width: 200px;"
-        class="filter-item"
-        @keyup.enter.native="crud.toQuery"
-      />
-      <el-input
-        v-model="query.source_bill_code"
-        clearable
-        size="mini"
-        placeholder="到货单号"
-        style="width: 200px;"
-        class="filter-item"
-        @keyup.enter.native="crud.toQuery"
-      />
-      <date-range-picker v-model="query.createTime" class="date-item" />
-      <el-select
-        v-model="query.status"
-        clearable
-        size="mini"
-        placeholder="单据状态"
-        class="filter-item"
-        style="width: 230px;"
-      >
-        <el-option
-          v-for="item in receiveStatusList"
-          :key="item.code"
-          :label="item.name"
-          :value="item.code"
-        />
-      </el-select>
       <el-input
         v-model="query.search"
         clearable
@@ -55,6 +21,30 @@
         class="filter-item"
         @keyup.enter.native="crud.toQuery"
       />
+      <el-input
+        v-model="query.pcsn"
+        clearable
+        size="mini"
+        placeholder="批次号"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="crud.toQuery"
+      />
+      <el-select
+        v-model="query.is_active"
+        clearable
+        size="mini"
+        placeholder="是否可用"
+        class="filter-item"
+        @change="crud.toQuery"
+      >
+        <el-option
+          v-for="item in dict.is_usable"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
       <rrOperation />
     </div>
     <!--表格渲染-->
@@ -67,19 +57,15 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="receive_code" width="150" label="订单编号" />
-      <el-table-column show-overflow-tooltip prop="base_bill_code" width="150" label="到货单号" />
-      <el-table-column show-overflow-tooltip prop="source_name" label="供应商" />
       <el-table-column show-overflow-tooltip prop="material_code" width="150" label="物料编码" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
       <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
-      <el-table-column show-overflow-tooltip prop="receive_qty" :formatter="crud.formatNum3" width="120" label="到货重量" />
-      <el-table-column show-overflow-tooltip prop="instor_qty" :formatter="crud.formatNum3" label="入库重量" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="检测重量" />
+      <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
+      <el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
+      <el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
+      <el-table-column show-overflow-tooltip prop="sum_qty" :formatter="crud.formatNum3" width="120" label="库存重量" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="可用重量" />
       <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
-      <el-table-column show-overflow-tooltip prop="status" label="状态" :formatter="stateFormat" />
-      <el-table-column show-overflow-tooltip prop="input_optname" label="创建人" />
-      <el-table-column show-overflow-tooltip prop="receive_date" width="120" label="到货日期" />
     </el-table>
     <!--分页组件-->
     <pagination />
@@ -95,15 +81,13 @@
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
-import crudReceivemst from '@/api/wms/pcs/receivemst'
 
 export default {
   name: 'AddDtl',
-  components: { rrOperation, pagination, DateRangePicker },
+  components: { rrOperation, pagination },
   cruds() {
-    return CRUD({ title: '用户', url: 'api/returnoutbill/addDtl',
-      query: { receive_code: '', source_bill_code: '', status: '', search: '', mater_type: '' },
+    return CRUD({ title: '用户', url: 'api/returnoutbill/queryWashDtl',
+      query: { pcsn: '', search: '', is_active: '' },
       optShow: {
         add: false,
         edit: false,
@@ -112,21 +96,17 @@ export default {
         download: false
       }})
   },
+  dicts: [ 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable'],
   mixins: [presenter(), header()],
   props: {
     dialogShow: {
       type: Boolean,
       default: false
-    },
-    openParam: {
-      type: String
     }
   },
   data() {
     return {
       dialogVisible: false,
-      receiveStatusList: [],
-      opendtlParam: '',
       rows: []
     }
   },
@@ -135,36 +115,26 @@ export default {
       handler(newValue, oldValue) {
         this.dialogVisible = newValue
       }
-    },
-    openParam: {
-      handler(newValue, oldValue) {
-        this.opendtlParam = newValue
-      }
     }
   },
   created() {
-    crudReceivemst.getStatus().then(res => {
-      this.receiveStatusList = res
-    })
   },
   methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.mater_type = this.opendtlParam
-    },
     close() {
       this.crud.resetQuery(false)
       this.$emit('update:dialogShow', false)
     },
     open() {
-      this.crud.query.mater_type = this.opendtlParam
       this.crud.toQuery()
     },
-    stateFormat(row, column) {
-      for (const item of this.receiveStatusList) {
-        if (item.code === row.status) {
-          return item.name
-        }
-      }
+    quality_scodeFormat(row) {
+      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+    },
+    ivt_levelFormat(row) {
+      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+    },
+    is_activeFormat(row) {
+      return this.dict.label.is_usable[row.is_active]
     },
     submit() {
       this.rows = this.$refs.multipleTable.selection

From 2f27393184589d8d977791becb41ed14b4dc9f3a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 30 Jun 2022 15:45:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sb/stat/websocket/AutoWebSocketTask.java  |  38 ++++
 .../wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql | 163 ++++++++++++++++++
 mes/qd/src/router/routers.js                  |   6 +
 .../src/views/wms/sb/stat/task/bigScreen.vue  | 128 ++++++++++++++
 4 files changed, 335 insertions(+)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
 create mode 100644 mes/qd/src/views/wms/sb/stat/task/bigScreen.vue

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java
new file mode 100644
index 00000000..c75f0de8
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java
@@ -0,0 +1,38 @@
+package org.nl.wms.sb.stat.websocket;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.mnt.websocket.MsgType;
+import org.nl.modules.mnt.websocket.SocketMsg;
+import org.nl.modules.mnt.websocket.WebSocketServer;
+import org.nl.wms.pf.service.AutoPfTaskService;
+import org.nl.wql.WQL;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AutoWebSocketTask {
+
+    public void run() {
+        try {
+            String today = DateUtil.today();
+            HashMap<String, String> map = new HashMap<>();
+            map.put("flag", "1");
+            map.put("today", "%"+today+"%");
+
+            JSONArray resultJSONArray = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParamMap(map).process().getResultJSONArray(0);
+
+            SocketMsg socketMsg = new SocketMsg(resultJSONArray, MsgType.INFO);
+            WebSocketServer.sendInfo(socketMsg,"20");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
new file mode 100644
index 00000000..83d2cfef
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
@@ -0,0 +1,163 @@
+[交易说明]
+	交易名：	实时查询统计任务
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.today					        TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		QUERY
+			SELECT
+			    mst.input_time AS input_time,
+			    mst.repair_code AS repair_code,
+			    (
+			        CASE
+                        mst.maintenancecycle
+                        WHEN '01' THEN '计划维修'
+                        WHEN '02' THEN '临时维修'
+                    END
+                ) AS maintenancecycle,
+			    file.device_code,
+			    file.device_name,
+			    (
+			        CASE
+                        mst.invstatus
+                        WHEN '01' THEN '生成'
+                        WHEN '02' THEN '提交'
+                        WHEN '03' THEN '开始'
+                        WHEN '04' THEN '委外维修'
+                        WHEN '05' THEN '委外验收'
+                        WHEN '06' THEN '结束'
+                        WHEN '07' THEN '确认'
+                        WHEN '99' THEN '审核'
+                    END
+                ) AS invstatus,
+			    mst.real_start_date,
+			    mst.real_end_date
+            FROM
+            	EM_BI_DeviceRepairMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
+            WHERE
+                mst.is_delete = '0'
+                AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today))
+                AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' )
+
+        UNION
+
+			SELECT
+			    st.create_time AS input_time,
+			    st.request_code AS repair_code,
+			    class.class_name AS maintenancecycle,
+			    file.device_code,
+			    file.device_name,
+			    (
+			        CASE
+			            st.is_passed
+			            WHEN '0' THEN
+			                (
+			                    CASE st.is_passed
+                                    WHEN '0' THEN '否'
+                                    WHEN '1' THEN '是'
+			                    END
+			                )
+			            WHEN '1' THEN
+			                (
+			                    CASE mst.invstatus
+			                        WHEN '01' THEN '生成'
+                                    WHEN '02' THEN '提交'
+                                    WHEN '03' THEN '开始'
+                                    WHEN '04' THEN '委外维修'
+                                    WHEN '05' THEN '委外验收'
+                                    WHEN '06' THEN '结束'
+                                    WHEN '07' THEN '确认'
+                                    WHEN '99' THEN '审核'
+                                END
+			                )
+			        END
+			    ) AS invstatus,
+			    mst.real_start_date,
+			    mst.real_end_date
+            FROM
+            	EM_BI_DeviceRepairRequest st
+            	LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON class.class_id = st.device_faultclass_id
+            	LEFT JOIN EM_BI_DeviceRepairMst mst ON mst.source_bill_id = st.request_id
+            WHERE
+                st.is_delete = '0'
+                AND (st.status <> '99' or (st.status = '99' and st.finish_time like 输入.today))
+                AND mst.source_bill_type = 'BXD'
+
+        UNION
+
+			SELECT
+			    mst.input_time AS input_time,
+			    mst.maint_code AS repair_code,
+                (
+                    CASE
+                        mst.maintenancecycle
+                        WHEN '01' THEN '计划保养'
+                        WHEN '02' THEN '临时保养'
+                    END
+                ) AS maintenancecycle,
+			    file.device_code,
+			    file.device_name,
+			    (
+			        CASE
+			            mst.invstatus
+			            WHEN '01' THEN '生成'
+			            WHEN '02' THEN '提交'
+			            WHEN '03' THEN '开始'
+			            WHEN '04' THEN '结束'
+			            WHEN '05' THEN '确认'
+			            WHEN '99' THEN '审核'
+			        END
+			    ) AS invstatus,
+			    mst.real_start_date,
+			    mst.real_end_date
+            FROM
+            	EM_BI_DeviceMaintenanceMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
+            WHERE
+                mst.is_delete = '0'
+                AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today))
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+
+
diff --git a/mes/qd/src/router/routers.js b/mes/qd/src/router/routers.js
index 95a2bca4..f61e138e 100644
--- a/mes/qd/src/router/routers.js
+++ b/mes/qd/src/router/routers.js
@@ -17,6 +17,12 @@ export const constantRouterMap = [
     hidden: true,
     meta: { title: '扩展屏' }
   },
+  {
+    path: '/bigScreen/task/stat',
+    component: (resolve) => require(['@/views/wms/sb/stat/task/bigScreen'], resolve),
+    hidden: true,
+    meta: { title: '任务看板' }
+  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/features/404'], resolve),
diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
new file mode 100644
index 00000000..a4d387fe
--- /dev/null
+++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
@@ -0,0 +1,128 @@
+<template>
+  <div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
+    <el-row>
+      <el-col :span="12">
+        <div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">统计任务看板</h2></div>
+      </el-col>
+
+      <el-col :span="12">
+        <div class="grid-content bg-purple-light">
+          <h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
+        </div>
+        <div class="grid-content bg-purple-light">
+          <p style="text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
+        </div>
+
+      </el-col>
+    </el-row>
+    <br>
+    <br>
+    <div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableData"
+        size="small"
+        style="width: 100%;"
+        border
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="input_time" label="生成时间" />
+        <el-table-column prop="repair_code" label="任务号" />
+        <el-table-column prop="maintenancecycle" label="任务类型" />
+<!--        <el-table-column prop="" label="部门" />-->
+        <el-table-column prop="device_code" label="设备编码" />
+        <el-table-column prop="device_name" label="设备名称" />
+        <el-table-column prop="invstatus" label="状态" />
+        <el-table-column prop="real_start_date" label="开始时间" />
+        <el-table-column prop="real_end_date" label="结束时间" />
+      </el-table>
+
+      <!--分页组件-->
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+import crud from '@/mixins/crud'
+
+export default {
+  name: 'BigscreenTask',
+  mixins: [crud],
+  data() {
+    return {
+      path: 'ws://localhost:8010/webSocket/20',
+      currentDate: new Date(),
+      getTime: '',
+      getDate: '',
+      tableData: []
+    }
+  },
+  created() {
+  },
+  mounted() {
+    // 定时器
+    const timer = setInterval(() => {
+      this.settime()// 你所加载数据的方法
+    }, 1000)
+    // 销毁定时器
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(timer)
+    })
+    this.init()
+  },
+  methods: {
+    settime() {
+      const _this = this
+      const yy = new Date().getFullYear()
+      const mm = new Date().getMonth() + 1
+      const dd = new Date().getDate()
+      const hh = new Date().getHours()
+      const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
+      const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
+      _this.getDate = yy + '年' + mm + '月' + dd + '日 ' + '星期' + '日一二三四五六'.charAt(new Date().getDay())
+      _this.getTime = hh + ':' + mf + ':' + ss
+    },
+    // webSocket
+    init: function() {
+      if (typeof (WebSocket) === 'undefined') {
+        alert('您的浏览器不支持socket')
+      } else {
+        // 实例化socket
+        this.socket = new WebSocket(this.path)
+        // 监听socket连接
+        this.socket.onopen = this.open
+        // 监听socket错误信息
+        this.socket.onerror = this.error
+        // 监听socket消息
+        this.socket.onmessage = this.getMessage
+      }
+    },
+    open: function() {
+      console.log('socket连接成功')
+    },
+    error: function() {
+      console.log('连接错误')
+    },
+    getMessage: function(msg) {
+      debugger
+      const data = JSON.parse(msg.data)
+      this.tableData = data.msg
+    },
+    send: function() {
+      // eslint-disable-next-line no-undef
+      this.socket.send(params)
+    },
+    close: function() {
+      console.log('socket已经关闭')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>