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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-10 16:41:21 +08:00
parent bae5e198fd
commit 29d99f2ecc
13 changed files with 412 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql
View File

@@ -50,7 +50,8 @@
PAGEQUERY
SELECT
plan.*,
ivt.product_area
ivt.product_area,
ivt.point_code
FROM
PDM_BI_SlittingProductionPlan plan
LEFT JOIN ST_IVT_CutPointIvt ivt ON ivt.ext_code = plan.resource_name

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

@@ -48,6 +48,8 @@ public class InchargeServiceImpl implements InchargeService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String bill_code = MapUtil.getStr(whereJson, "bill_code");
String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
@@ -57,6 +59,8 @@ public class InchargeServiceImpl implements InchargeService {
map.put("create_mode", MapUtil.getStr(whereJson, "create_mode"));
map.put("bill_type", MapUtil.getStr(whereJson, "bill_type"));
if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code","%"+bill_code + "%");
if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn + "%");
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn + "%");
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();

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

@@ -52,6 +52,7 @@ public class OutChargeServiceImpl implements OutChargeService {
String end_point_code = MapUtil.getStr(whereJson, "end_point_code");
String start_region_code = MapUtil.getStr(whereJson, "start_region_code");
String end_region_code = MapUtil.getStr(whereJson, "end_region_code");
String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "15");
@@ -61,6 +62,7 @@ public class OutChargeServiceImpl implements OutChargeService {
if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%");
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", material_code + "%");
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", pcsn + "%");
if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", sap_pcsn + "%");
if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code", start_point_code + "%");
if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code", end_point_code + "%");
if (ObjectUtil.isNotEmpty(start_region_code)) map.put("start_region_code", start_region_code + "%");

8
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -190,12 +190,20 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
total_qty += Double.parseDouble(net_weight);
row.put("box_no", row.get("package_box_sn"));
//判断该木箱是否已经生成入库单
//判断该载具是否已经分配货位或者起点
JSONArray now_dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag","18").addParam("box_no",row.get("package_box_sn")).process().getResultJSONArray(0);
if (now_dis_rows.size() > 0) {
throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
}
//判断该木箱是否已经存在库内
JSONObject str_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '"+row.get("package_box_sn")+"'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(str_jo)){
throw new BadRequestException("木箱："+row.get("package_box_sn")+"已存在库内，请对数据进行核实！");
}
/*//如果是退货入库，查询对应的包装关系维护交货单号和交货单行号
if (whereJson.get("bill_type").equals("0002")) {
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '" + row.get("container_name") + "'").uniqueResult(0);

14
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
View File

@@ -18,6 +18,8 @@
输入.end_time TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.stor_id TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.create_mode TYPEAS s_string
输入.bill_type TYPEAS s_string
输入.in_stor_id TYPEAS f_string
@@ -47,10 +49,12 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
SELECT DISTINCT
ios.*
FROM
ST_IVT_IOStorInv ios
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
ios.is_delete = '0'
AND ios.io_type = '0'
@@ -67,6 +71,14 @@
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION

26
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -583,10 +583,12 @@
IF 输入.flag = "15"
PAGEQUERY
SELECT
SELECT DISTINCT
ios.*
FROM
ST_IVT_IOStorInv ios
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
ios.is_delete = '0'
AND
@@ -606,6 +608,12 @@
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION
@@ -670,6 +678,22 @@
ENDQUERY
ENDIF
IF 输入.flag = "18"
QUERY
SELECT
*
FROM
st_ivt_iostorinvdis dis
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
WHERE
dis.box_no = 输入.box_no
AND work_status < '99'
AND mst.is_delete = '0'
AND mst.bill_status < '99'
ENDSELECT
ENDQUERY
ENDIF

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

@@ -56,6 +56,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
map.put("begin_time", MapUtil.getStr(whereJson, "begin_time"));
map.put("end_time", MapUtil.getStr(whereJson, "end_time"));
map.put("pcsn", MapUtil.getStr(whereJson, "pcsn"));
map.put("sap_pcsn", MapUtil.getStr(whereJson, "pcsn"));
map.put("is_writeoff", MapUtil.getStr(whereJson, "is_writeoff"));
map.put("vbeln", MapUtil.getStr(whereJson, "vbeln"));
if (!ObjectUtil.isEmpty(bill_code)) map.put("bill_code", "%" + bill_code + "%");

8
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.material_id TYPEAS s_string
输入.material_search TYPEAS s_string
输入.stor_id TYPEAS s_string
@@ -71,6 +72,7 @@
LEFT JOIN ST_IVT_IOStorInvDis dis ON dis.iostorinvdtl_id = dtl.iostorinvdtl_id
LEFT JOIN sys_user user ON user.user_id = mst.upload_optid
INNER JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
mst.is_delete = '0'
and mst.stor_id in 输入.in_stor_id
@@ -80,9 +82,13 @@
ENDOPTION
OPTION 输入.pcsn <> ""
dtl.pcsn = 输入.pcsn
dis.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn = 输入.sap_pcsn
ENDOPTION
OPTION 输入.is_writeoff <> ""
mst.is_writeoff = 输入.is_writeoff
ENDOPTION