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

rev：是、出入库导出修改

Browse Source
This commit is contained in:
liuxy
2023-10-17 08:57:49 +08:00
parent f9c6c5e35e
commit 1d9f35dded
3 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,9 +823,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!"); throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
} }
map.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
map.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
try {
map.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
map.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
map.put("销售订单", json.getString("sale_order_name"));
map.put("行号", "");
}
String statusName = ""; String statusName = "";
if (StrUtil.equals(json.getString("work_status"), "00")) { if (StrUtil.equals(json.getString("work_status"), "00")) {
statusName = "未生成"; statusName = "未生成";

37
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -278,8 +278,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!"); throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("客户编码", json.getString("customer_name")); mp.put("客户编码", json.getString("customer_name"));
mp.put("规格", json.getString("thickness_request")); mp.put("规格", json.getString("thickness_request"));
mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard"))); mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -327,8 +332,14 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!"); throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("生产日期", json.getString("date_of_production").replace("-","/")); mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
mp.put("箱号", json.getString("box_no")); mp.put("箱号", json.getString("box_no"));
mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim()); mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());
@@ -413,8 +424,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!"); throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("客户编码", json.getString("customer_name")); mp.put("客户编码", json.getString("customer_name"));
mp.put("规格", json.getString("thickness_request")); mp.put("规格", json.getString("thickness_request"));
mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard"))); mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -462,8 +478,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!"); throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("生产日期", json.getString("date_of_production").replace("-","/")); mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
mp.put("箱号", json.getString("box_no")); mp.put("箱号", json.getString("box_no"));
mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim()); mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());

18
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
View File

@@ -186,8 +186,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!"); throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("出库日期", json.getString("input_time")); mp.put("出库日期", json.getString("input_time"));
mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
mp.put("产品厚度", json.getString("thickness")); mp.put("产品厚度", json.getString("thickness"));
@@ -253,8 +258,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!"); throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
} }
mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-"))); try {
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length())); mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", "");
}
mp.put("出库日期", json.getString("input_time")); mp.put("出库日期", json.getString("input_time"));
mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
mp.put("产品厚度", json.getString("thickness")); mp.put("产品厚度", json.getString("thickness"));