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

add：新增运转费、卸车费、其他费用

Browse Source
This commit is contained in:
liuxy
2023-06-13 08:58:27 +08:00
parent 3b8564432e
commit 0e43cbaa71
9 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
View File

Binary file not shown.

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -57,6 +58,7 @@ public class OutChargeServiceImpl implements OutChargeService {
HashMap<String, String> map = new HashMap<>();
map.put("flag", "15");
map.put("bill_status", MapUtil.getStr(whereJson, "bill_status"));
map.put("bill_type", MapUtil.getStr(whereJson, "bill_type"));
map.put("stor_id", MapUtil.getStr(whereJson, "stor_id"));
if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code", bill_code + "%");
if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%");
@@ -171,11 +173,14 @@ public class OutChargeServiceImpl implements OutChargeService {
//插入分配表
dis_wql.insert(dis_row);
//将包装关系中对应的记录状态改为包装
HashMap<String, String> map = new HashMap<>();
map.put("status", "1");
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'");
if (StrUtil.equals(mst_jo.getString("bill_type"), "1001")) {
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'");
} else {
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "'");
}
}
}

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

@@ -623,7 +623,7 @@
AND
ios.bill_status = '99'
AND
ios.bill_type = '1001'
ios.bill_type in ('1001','1009')
AND
ios.stor_id in 输入.in_stor_id

1
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -57,6 +57,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
.next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority"))
.class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type))
.remark(json.getString("remark"))
.build();

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

@@ -5025,7 +5025,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapFL.put("material_spec", material_spec);
// mapFL.put("qty_unit_name", "KG");
mapFL.put("box_no", sub_box_no);
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); // 净重
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重
} else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
}
flData.add(mapFL);
all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
}
@@ -5079,6 +5085,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// mapFL.put("qty_unit_name", "KG");
mapFL.put("box_no", sub_box_no);
mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue());
if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重
} else {
mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重
}
flData.add(mapFL);
// 计算合计重量

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

@@ -462,6 +462,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
paramSapMst.put("ZACTION", "P");
paramSapMst.put("BUDAT", jo_mst.getString("biz_date"));
paramSapMst.put("ZZYGYF", jo_mst.getString("estimated_freight"));
paramSapMst.put("ZZYZFY", jo_mst.getString("run_freight"));
paramSapMst.put("ZZXCFY", jo_mst.getString("unload_freight"));
paramSapMst.put("ZZQTFY", jo_mst.getString("other_freight"));
paramSapMst.put("ZZYFGY", jo_mst.getString("trans_code"));
JSONArray paramDtlArr = new JSONArray();
@@ -1045,6 +1048,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
paramSapMst.put("ZACTION", "P");
paramSapMst.put("BUDAT", jo_mst.getString("biz_date"));
paramSapMst.put("ZZYGYF", jo_mst.getString("estimated_freight"));
paramSapMst.put("ZZYZFY", jo_mst.getString("run_freight"));
paramSapMst.put("ZZXCFY", jo_mst.getString("unload_freight"));
paramSapMst.put("ZZQTFY", jo_mst.getString("other_freight"));
paramSapMst.put("ZZYFGY", jo_mst.getString("trans_code"));
JSONArray paramDtlArr = new JSONArray();