root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-17 18:05:43 +08:00
parent 5dc73a6832
commit 63e75dc8fe
8 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java
View File

@@ -63,11 +63,18 @@ public class PdaCheckServiceImpl implements PdaCheckService {
//明细表
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl");
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONArray dtlArr = wo_dtl.query("check_code = '" + whereJson.getString("check_code") + "'").getResultJSONArray(0);
JSONArray dtlArr = new JSONArray();
JSONArray check_rows = whereJson.getJSONArray("check_rows");
for (int i = 0; i < check_rows.size(); i++) {
JSONObject json = check_rows.getJSONObject(i);
JSONObject jsonObject = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0);
jsonObject.put("fac_qty",json.getString("fac_qty"));
dtlArr.add(jsonObject);
}
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONObject param = new JSONObject();
param.put("form",jsonMst);
param.put("row",jsonMst);
param.put("rows",dtlArr);
checkService.saveCheck(param);
@@ -83,12 +90,19 @@ public class PdaCheckServiceImpl implements PdaCheckService {
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_CheckMst");
//明细表
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl");
JSONArray dtlArr = new JSONArray();
JSONArray check_rows = whereJson.getJSONArray("check_rows");
for (int i = 0; i < check_rows.size(); i++) {
JSONObject json = check_rows.getJSONObject(i);
JSONObject jsonObject = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0);
jsonObject.put("fac_qty",json.getString("fac_qty"));
dtlArr.add(jsonObject);
}
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONArray dtlArr = wo_dtl.query("check_code = '" + whereJson.getString("check_code") + "'").getResultJSONArray(0);
JSONObject param = new JSONObject();
param.put("form",jsonMst);
param.put("row",jsonMst);
param.put("rows",dtlArr);
checkService.confirm(param);

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "3").process().getResultJSONArray(0);
JSONObject jo = new JSONObject();
jo.put("rows", resultJSONArray);
jo.put("data", resultJSONArray);
jo.put("message", "查询成功!");
return jo;
}

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql
View File

@@ -67,7 +67,7 @@
WHEN '0' THEN '正常'
WHEN '1' THEN '异常'
END
) AS status,
) AS is_nok,
input_optname,
input_time,
confirm_optname,
@@ -108,8 +108,8 @@
dtl.storagevehicle_code,
mater.material_code,
mater.material_name,
dtl.base_qty,
dtl.fac_qty,
ROUND(dtl.base_qty) AS base_qty,
ROUND(dtl.fac_qty) AS fac_qty,
dtl.qty_unit_name,
(
CASE

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
View File

@@ -138,7 +138,7 @@
IF 输入.flag = "3"
QUERY
SELECT
label,
label AS text,
value
FROM
sys_dict_detail

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -260,6 +260,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
jsonDtl.put("assign_qty", "0");
jsonDtl.put("unassign_qty", row.get("plan_qty"));
jsonDtl.put("vbeln", row.getString("vbeln"));
jsonDtl.put("posnr", row.getString("posnr"));
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
qty += jsonDtl.getDoubleValue("plan_qty");
@@ -1351,6 +1353,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.addParam("iostorinv_id", map.get("iostorinv_id"))
.addParam("stor_id", map.get("stor_id"))
.addParam("sect_id", map.get("sect_id"))
.addParam("remark", map.get("remark"))
.addParam("sale_order_name", map.get("source_bill_code"))
.process()
.getResultJSONArray(0);
return jo;

19
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -42,6 +42,7 @@
输入.task_id TYPEAS s_string
输入.task_status TYPEAS s_string
输入.deptIds TYPEAS f_string
输入.sale_order_name TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -161,6 +162,7 @@
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt.struct_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
LEFT JOIN pdm_bi_subpackagerelation sub ON struct.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1 and struct.lock_type='1'
and struct.struct_id in (
@@ -177,6 +179,9 @@
OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt.quality_scode = 输入.quality_scode
ENDOPTION
@@ -184,7 +189,7 @@
ivt.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.remark <> ""
(mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark)
struct.struct_code like 输入.remark
ENDOPTION
OPTION 输入.ivt_level <> ""
ivt.ivt_level = 输入.ivt_level
@@ -192,9 +197,6 @@
OPTION 输入.is_active <> ""
ivt.is_active = 输入.is_active
ENDOPTION
OPTION 输入.stor_id <> ""
ivt.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
ENDOPTION
@@ -218,11 +220,15 @@
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt2.struct_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
LEFT JOIN pdm_bi_subpackagerelation sub ON struct.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1 and struct.lock_type='1'
OPTION 输入.material_id <> ""
ivt2.material_id = 输入.material_id
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt2.quality_scode = 输入.quality_scode
ENDOPTION
@@ -230,7 +236,7 @@
ivt2.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.remark <> ""
(mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark)
struct.struct_code like 输入.remark
ENDOPTION
OPTION 输入.ivt_level <> ""
ivt2.ivt_level = 输入.ivt_level
@@ -238,9 +244,6 @@
OPTION 输入.is_active <> ""
ivt2.is_active = 输入.is_active
ENDOPTION
OPTION 输入.stor_id <> ""
ivt2.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
ENDOPTION

2
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject param = new JSONObject();
param.put("HEAD", paramSapMstArr);
// System.out.println(param.toString());
System.out.println(param.toString());
// 调用接口回传
new LmsToSapServiceImpl().returnDelivery(param);

7
lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -56,7 +56,7 @@
clearable
style="width: 220px"
size="mini"
placeholder="货位编码、名称或载具号"
placeholder="货位编码"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -150,9 +150,12 @@ export default {
},
methods: {
open() {
crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
crudSectattr.getSect({ is_productstore: '1' }).then(res => {
debugger
this.sects = res.content
})
this.query.source_bill_code = this.queryrow.source_bill_code
this.query.material_id = this.queryrow.material_id
},
queryStruct() {
this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(this.queryrow.assign_qty)