diff --git 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
index b84861be..45090b49 100644
--- 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
@@ -90,27 +90,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("io_type"))) {
map.put("io_type", map.get("io_type"));
}
+ if (StrUtil.isNotEmpty(map.get("is_upload"))) {
+ map.put("is_upload", map.get("is_upload"));
+ }
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", "%" + map.get("pcsn") + "%");
}
if (StrUtil.isNotEmpty(map.get("material_code"))) {
map.put("material_code", "%" + map.get("material_code") + "%");
}
+ map.put("flag", "12");
JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
- JSONArray json = jo.getJSONArray("content");
- map.put("flag", "01");
- JSONArray jo2 = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).process().getResultJSONArray(1);
-
- if(jo2.size()!=0){
- JSONObject jo3 = jo2.getJSONObject(0);
- jo3.put("bill_code","合计");
- json.add(jo3);
- }else{
- JSONObject jo3 = new JSONObject();
- jo3.put("stor_name","合计");
- json.add(jo3);
- }
- jo.put("content",json);
return jo;
}
diff --git 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
index d70c4503..c8fbdbd1 100644
--- 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
@@ -29,6 +29,7 @@
输入.material_code TYPEAS s_string
输入.quality_scode TYPEAS s_string
输入.pcsn TYPEAS s_string
+ 输入.is_upload TYPEAS s_string
输入.ivt_level TYPEAS s_string
输入.is_active TYPEAS s_string
输入.sect_id TYPEAS s_string
@@ -670,6 +671,87 @@
ENDQUERY
ENDIF
+ IF 输入.flag = "12"
+ PAGEQUERY
+ SELECT
+ supp.supp_name,
+ mst.iostorinv_id,
+ mst.bill_code,
+ mst.buss_type,
+ mst.io_type,
+ mst.bill_type,
+ mst.bill_status,
+ mst.stor_name,
+ mst.biz_date,
+ create_mode,
+ material_code,
+ material_name,
+ dtl.pcsn,
+ plan_qty,
+ assign_qty,
+ unassign_qty,
+ quality_scode,
+ ivt_level,
+ is_active,
+ dtl.qty_unit_name,
+ IF(is_upload='0','否','是') as is_upload,
+ mst.upload_time,sys_user.nick_name as input_optname,mst.input_time,mst.confirm_time
+ FROM
+ st_ivt_iostorinvdtl dtl
+ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
+ LEFT JOIN sys_user on mst.input_optid = sys_user.user_id
+ left join md_me_materialbase mb on dtl.material_id=mb.material_id
+ left join PCS_RC_ReceiveDtl on dtl.material_id=PCS_RC_ReceiveDtl.material_id and dtl.pcsn = PCS_RC_ReceiveDtl.pcsn
+ LEFT JOIN PCS_IF_PurchaseOrderProc proc ON proc.id = PCS_RC_ReceiveDtl.source_billdtl_id
+ LEFT JOIN MD_CS_SUPPLIERBASE supp ON proc.vend_id = supp.ext_id
+ where 1=1
+ and mst.is_delete='0'
+ OPTION 输入.bill_code <> ""
+ mst.bill_code like 输入.bill_code
+ ENDOPTION
+ OPTION 输入.io_type <> ""
+ mst.io_type = 输入.io_type
+ ENDOPTION
+ OPTION 输入.buss_type <> ""
+ mst.buss_type like 输入.buss_type
+ ENDOPTION
+ OPTION 输入.bill_type <> ""
+ mst.bill_type = 输入.bill_type
+ ENDOPTION
+ OPTION 输入.stor_id <> ""
+ mst.stor_id = 输入.stor_id
+ ENDOPTION
+ OPTION 输入.deptIds <> ""
+ mst.sysdeptid in 输入.deptIds
+ ENDOPTION
+ OPTION 输入.create_mode <> ""
+ mst.create_mode = 输入.create_mode
+ ENDOPTION
+ OPTION 输入.is_upload <> ""
+ mst.is_upload = 输入.is_upload
+ ENDOPTION
+ OPTION 输入.quality_scode <> ""
+ dtl.quality_scode = 输入.quality_scode
+ ENDOPTION
+ OPTION 输入.pcsn <> ""
+ dtl.pcsn like 输入.pcsn
+ ENDOPTION
+ OPTION 输入.material_code <> ""
+ (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
+ ENDOPTION
+ OPTION 输入.bill_status <> ""
+ mst.bill_status = 输入.bill_status
+ ENDOPTION
+ OPTION 输入.begin_time <> ""
+ mst.input_time >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ mst.input_time <= 输入.end_time
+ ENDOPTION
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
diff --git a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
index c3689a4a..2edd05a2 100644
--- a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
@@ -199,27 +199,30 @@
>
-
+
+
-
-
-
- {{ fun(scope.row.total_qty) }}
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
@@ -260,7 +263,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
- dicts: ['ST_QUALITY_SCODE', 'io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
+ dicts: ['ST_QUALITY_SCODE', 'io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload','is_usable', 'ST_IVT_LEVEL','ST_QUALITY_SCODE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -344,6 +347,15 @@ export default {
this.work_flag = false
}
},
+ ivt_levelFormat(row) {
+ return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+ },
+ quality_scodeFormat(row) {
+ return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+ },
+ is_activeFormat(row) {
+ return this.dict.label.is_usable[row.is_active]
+ },
ioTypeChange(value) {
if (value === '1') {
crudRawAssist.getType({ 'io_code': '', 'io_flag': '01' }).then(res => {