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-26 21:34:42 +08:00
parent 48f42dd3c4
commit 12b20ba659
6 changed files with 199 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
View File

@@ -108,4 +108,13 @@ public class SubpackagerelationDto implements Serializable {
/** sap批次 */
private String sap_pcsn;
/** 长 */
private String box_length;
/** 宽 */
private String box_width;
/** 高 */
private String box_high;
}

18
lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
View File

@@ -46,6 +46,16 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
String customer_description = MapUtil.getStr(whereJson, "customer_description");
String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
String container_name = MapUtil.getStr(whereJson, "container_name");
String is_un_plan_production = MapUtil.getStr(whereJson, "is_un_plan_production");
String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
String date_of_production = MapUtil.getStr(whereJson, "date_of_production");
String date_of_FG_inbound = MapUtil.getStr(whereJson, "date_of_FG_inbound");
String status = MapUtil.getStr(whereJson, "status");
// 子卷号 是否计划外子卷 sap批次 制造完成日期 入库日期 状态
JSONObject map = new JSONObject();
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%");
@@ -55,6 +65,14 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%");
if (ObjectUtil.isNotEmpty(customer_description)) map.put("customer_description","%"+customer_description+"%");
if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%");
if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%");
map.put("is_un_plan_production",is_un_plan_production);
map.put("date_of_production",date_of_production);
map.put("date_of_FG_inbound",date_of_FG_inbound);
map.put("status",status);
JSONObject json = WQL.getWO("PDM_BI_SUBPACKAGER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
return json;
}

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

@@ -20,6 +20,12 @@
输入.customer_name TYPEAS s_string
输入.customer_description TYPEAS s_string
输入.package_box_sn TYPEAS s_string
输入.container_name TYPEAS s_string
输入.is_un_plan_production TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.date_of_production TYPEAS s_string
输入.date_of_FG_inbound TYPEAS s_string
输入.status TYPEAS s_string
[临时表]
@@ -76,6 +82,30 @@
customer_description LIKE 输入.customer_description
ENDOPTION
OPTION 输入.container_name <> ""
container_name LIKE 输入.container_name
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sap_pcsn LIKE 输入.sap_pcsn
ENDOPTION
OPTION 输入.is_un_plan_production <> ""
is_un_plan_production = 输入.is_un_plan_production
ENDOPTION
OPTION 输入.date_of_production <> ""
date_of_production = 输入.date_of_production
ENDOPTION
OPTION 输入.date_of_FG_inbound <> ""
date_of_FG_inbound = 输入.date_of_FG_inbound
ENDOPTION
OPTION 输入.status <> ""
status = 输入.status
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -2132,8 +2132,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表
WQLObject dtlTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库明细表
WQLObject disTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库分配明细
WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表
WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0);
@@ -2175,7 +2175,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
double all_box_qty = 0;
for (int t = 0; t < jsonAllBox.size(); t++) {
JSONObject json = jsonAllBox.getJSONObject(t);
NumberUtil.add(all_box_qty,json.getDoubleValue("box_qty"));
all_box_qty = NumberUtil.add(all_box_qty,json.getDoubleValue("box_qty"));
}
oneMap.put("all_box_qty", NumberUtil.round(all_box_qty,2).toString());
oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址