opt:需求：回温间到快速回温间显示信息同库存明细一致

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml

@@ -210,34 +210,89 @@
         ORDER BY a.pointCode ASC
     </select>
 
-    <select id="queryMoveDetail2" resultType="org.nl.wms.sch.report.service.dto.YCLKCDto">
+    <select id="queryMoveDetail2" resultType="org.nl.wms.sch.report.service.dto.HwDto">
         SELECT
-        a.*
+        *
         FROM
         (
         SELECT
         p.point_code AS pointCode,
+        p.point_name AS pointName,
+        p.region_code AS regionCode,
         p.region_name AS regionName,
         p.vehicle_code2 AS subTray,
         p.vehicle_code AS motherTray,
-        ( CASE WHEN ( p.ing_task_code = '' OR p.ing_task_code IS NULL ) THEN 0 ELSE 1 END ) AS STATUS,
-        p.update_time AS updateTime
+        p.update_time AS updateTime,
+        p.ing_task_code AS ing_task_code,
+        ( CASE WHEN ( p.ing_task_code = '' OR p.ing_task_code IS NULL ) THEN 0 ELSE 1 END ) AS status,
+        v.standing_time AS standingTime,
+        m2.siliconGrade AS siliconGrade,
+        m2.productDescription AS productDescription,
+        m2.supplierName AS supplierName,
+        m2.ingotBatch AS ingotBatch,
+        m2.number AS number,
+        TIMESTAMPDIFF(
+        HOUR,
+        p.update_time,
+        curtime()) AS usedTime
         FROM
         sch_base_point p
+        LEFT JOIN sch_base_vehiclematerialgroup v ON p.vehicle_code2 = v.vehicle_code
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON p.vehicle_code2 = m2.PalletSN
         WHERE
         p.vehicle_code2 != ''
         AND p.vehicle_code2 IS NOT NULL
+        AND p.point_code LIKE 'XHW%'
         AND p.is_used = '1'
-        AND (p.ing_task_code IS NULL or  p.ing_task_code = '')
-        AND p.region_code IN ( 'HW' )) a
-        WHERE 1=1
+        AND ( p.ing_task_code IS NULL OR p.ing_task_code = '' )
+        AND v.group_bind_material_status = '2'
+        AND p.region_code IN ( 'HW' )
+        <if test="query.supplierName  != null">
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
+        </if>
+        <if test="query.productDescription  != null">
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+        </if>
         <if test="query.point_code  != null">
-            and a.pointCode = #{query.point_code}
+            and p.point_code like  CONCAT('%', #{query.point_code}, '%')
+        </if>
+        <if test="query.region_code  != null">
+            and p.region_code like  CONCAT('%', #{query.region_code}, '%')
+        </if>
+        <if test="query.ingotBatch  != null">
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
         </if>
+        ) a
+        where 1=1
         <if test="query.status  != null">
             and a.status =  #{query.status}
         </if>
-        ORDER BY a.pointCode ASC
+        ORDER BY
+        a.pointCode ASC
     </select>
 
     <select id="queryYlIn" resultType="org.nl.wms.sch.report.service.dto.YlDto">

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java

@@ -40,4 +40,6 @@ public class HwDto implements Serializable {
     private String ingotBatch;
     /** 任务号 */
     private String ing_task_code;
+    /** 是否有任务标识 */
+    private String status;
 }

lms/nladmin-ui/src/views/wms/hw/movestor2/index.vue

@@ -27,6 +27,80 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="晶体编号">
+            <el-input
+              v-model="query.lotSN"
+              clearable
+              size="mini"
+              placeholder="晶体编号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-select
+              v-model="query.supplierName"
+              clearable
+              size="mini"
+              placeholder="供应商名称"
+              class="filter-item"
+              filterable
+              @remote-method="getNowSupplierNameList"
+            >
+              <el-option
+                v-for="item in supplierNameList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-select
+              v-model="query.productDescription"
+              clearable
+              size="mini"
+              placeholder="物料名称"
+              class="filter-item"
+              filterable
+              @remote-method="getNowProductDescriptionList"
+            >
+              <el-option
+                v-for="item in productDescriptionList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-select
+              v-model="query.ingotBatch"
+              clearable
+              size="mini"
+              placeholder="批次"
+              class="filter-item"
+              filterable
+              @remote-method="getNowIngotBatchList"
+            >
+              <el-option
+                v-for="item in ingotBatchList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -82,7 +156,15 @@
         <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
         <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
         <el-table-column prop="status" label="提交状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
+
+        <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
+        <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
+        <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
+        <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
         <el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
+        <el-table-column prop="standingTime" label="回温时间H" :min-width="flexWidth('standingTime',crud.data,'回温时间H')" />
+        <el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -97,6 +179,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+import crudMaterial from "@/views/wms/sch/report/report";
 
 export default {
   name: 'moveStor2',
@@ -126,11 +209,17 @@ export default {
       dialogVisible: false,
       rows: [],
       pointList: [],
+      supplierNameList: [],
+      ingotBatchList: [],
+      productDescriptionList: [],
       choose: '物料'
     }
   },
   created() {
     this.getPointList()
+    this.getNowSupplierNameList()
+    this.getNowIngotBatchList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -138,6 +227,26 @@ export default {
       this.handleCurrentChange(null)
       return true
     },
+    getPointList() { // 获取点位列表
+      crudSchBasePoint.getPointsByRegionCodes('HW').then(res => {
+        this.pointList = res
+      })
+    },
+    getNowSupplierNameList() {
+      crudMaterial.getNowSupplierNameList().then(res => {
+        this.supplierNameList = res.content
+      })
+    },
+    getNowProductDescriptionList() {
+      crudMaterial.getNowProductDescriptionList().then(res => {
+        this.productDescriptionList = res.content
+      })
+    },
+    getNowIngotBatchList() {
+      crudMaterial.getNowIngotBatchList().then(res => {
+        this.ingotBatchList = res.content
+      })
+    },
     confirm() {
       this.rows = this.$refs.table.selection
       if (this.rows.length <= 0) {
@@ -241,11 +350,6 @@ export default {
         return '已提交';
       }
       return '未提交';
-    },
-    getPointList() { // 获取点位列表
-      crudSchBasePoint.getPointsByRegionCodes('HW').then(res => {
-        this.pointList = res
-      })
     }
   }
 }