From 87e90ae301be5d2e0270f7c1cc45aa0190cfdf7f Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 6 Jun 2025 17:58:10 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=97=AE=E9=A2=98138=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAERP=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E9=87=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/wms/WmsRawOutstockMapper.xml       |  8 +++++--
 .../src/views/wms/info/rawoutstock/index.vue  | 23 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
index 39a981b2..71ccc0d2 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
@@ -265,10 +265,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select wro.raw_outstock_id, wro.task_code, wro.warehouse_id, wro.location_code, wro.order_id, wro.plan_code, wro.plan_detail_code, wro.station_id,wro.material_batch,
         wro.material_id, wro.operation_type, wro.task_type, wro.apply_reason, wro.audit_reason, wro.audit_status, wro.execute_status, wro.apply_by, wro.apply_date,
         wro.audit_by, wro.audit_date, wro.update_by, wro.update_date, wro.begin_time, wro.end_time,wro.outstock_amount,wro.real_outstock_amount,wbw.warehouse_name
-        ,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name
+        ,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name, wrod.erp_status, wrod.erp_amount
         from wms_raw_outstock wro left join wms_base_warehouse wbw on wro.warehouse_id = wbw.warehouse_id
-         left join mes_base_material_info mbmi on wro.material_id=mbmi.material_id
+        left join mes_base_material_info mbmi on wro.material_id=mbmi.material_id
         left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
+        left join (select raw_outstock_id, max(erp_status) erp_status, max(erp_amount) erp_amount
+        from wms_raw_outstock_detail
+        group by raw_outstock_id) wrod on wro.raw_outstock_id = wrod.raw_outstock_id
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wro.task_code like concat('%', #{taskCode}, '%')</if>
             <if test="warehouseId != null "> and wro.warehouse_id = #{warehouseId}</if>
@@ -282,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
             <if test="materialSpec != null  and materialSpec != ''"> and mbmi.material_spec like concat('%', #{materialSpec}, '%')</if>
+            <if test="erpStatus != null  and erpStatus != ''"> and wrod.erp_status = #{erpStatus}</if>
         </where>
         order by wro.apply_date desc
     </select>
diff --git a/hw-ui/src/views/wms/info/rawoutstock/index.vue b/hw-ui/src/views/wms/info/rawoutstock/index.vue
index b6707650..69c7fc56 100644
--- a/hw-ui/src/views/wms/info/rawoutstock/index.vue
+++ b/hw-ui/src/views/wms/info/rawoutstock/index.vue
@@ -113,6 +113,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="同步ERP状态" prop="erpStatus" label-width="100px">
+        <el-select
+          v-model="queryParams.erpStatus"
+          placeholder="请选择同步ERP状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.wms_erp_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -139,6 +154,12 @@
       </el-table-column>
       <el-table-column label="申请数量" align="center" prop="outstockAmount"/>
       <el-table-column label="出库数量" align="center" prop="realOutstockAmount"/>
+      <el-table-column label="同步ERP状态" align="center" prop="erpStatus" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wms_erp_status" :value="scope.row.erpStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="同步ERP数量" align="center" prop="erpAmount" width="100"/>
       <el-table-column label="申请人" align="center" prop="applyBy"/>
       <el-table-column label="申请原因" align="center" prop="applyReason"/>
       <el-table-column label="申请时间" align="center" prop="applyDate" width="180">
@@ -192,7 +213,7 @@ import {listRawoutstock, getWarehouses} from "@/api/wms/rawoutstock";
 
 export default {
   name: "Rawoutstock",
-  dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_outstock_task_type'],
+  dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_outstock_task_type','wms_erp_status'],
   data() {
     return {
       // 遮罩层