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
and wro.task_code like concat('%', #{taskCode}, '%')
and wro.warehouse_id = #{warehouseId}
@@ -282,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mbmi.material_code like concat('%', #{materialCode}, '%')
and mbmi.material_name like concat('%', #{materialName}, '%')
and mbmi.material_spec like concat('%', #{materialSpec}, '%')
+ and wrod.erp_status = #{erpStatus}
order by wro.apply_date desc
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 @@
/>
+
+
+
+
+
搜索
重置
@@ -139,6 +154,12 @@
+
+
+
+
+
+
@@ -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 {
// 遮罩层