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

rev：一体机修改重量为g

Browse Source
This commit is contained in:
liuxy
2023-07-06 14:49:41 +08:00
parent 39e9afae00
commit ebe6d6f027
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java
View File

@@ -29,6 +29,7 @@ public class MpsSaleOrder implements Serializable{
/**
* 销售单标识
*/
@TableId
private Long sale_id;
/**
* 销售单号

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml
View File

@@ -7,7 +7,7 @@
dtl.*,
mb.material_code,
mb.material_spec,
ROUND((dtl.base_qty * 1000 ) / mb.net_weight,3) AS qty,
ROUND(dtl.base_qty / mb.net_weight,3) AS qty,
mst.check_type,
mst.create_time,
mst.create_name

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
View File

@@ -9,7 +9,7 @@
mater.material_spec,
task.task_code,
task.task_status,
ROUND((dtl.plan_qty * 1000) / dtl.unit_weight,3 ) AS weight_qty
ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS weight_qty
FROM
st_ivt_iostorinv_bcp dtl
LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
@@ -49,7 +49,7 @@
dtl.*,
mater.material_code,
mater.material_spec,
ROUND((dtl.plan_qty * 1000) / dtl.unit_weight,3) AS qty
ROUND(dtl.plan_qty / dtl.unit_weight,3) AS qty
FROM
st_ivt_iostorinv_bcp dtl
LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java
View File

@@ -27,6 +27,7 @@ import java.math.BigDecimal;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -47,7 +48,7 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl<StIvtShutframed
public int create(JSONArray rows, String shutframeinv_id) {
// 根据数量排序 默认由大到小
List<Object> list = rows.stream()
.sorted(Comparator.comparing(row -> ((JSONObject) row).getDoubleValue("canuse_qty")).reversed()).collect(Collectors.toList());
.sorted(Comparator.comparing(row -> (Integer)((Map) row).get("canuse_qty")).reversed()).collect(Collectors.toList());
rows = JSONArray.parseArray(JSON.toJSONString(list));
StIvtStructattr first_struct = null;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
View File

@@ -177,7 +177,7 @@
mater.material_name,
mater.material_spec,
unit.unit_name,
ROUND((ivt.canuse_qty * 1000 )/ mater.net_weight,3) AS qty,
ROUND(ivt.canuse_qty / mater.net_weight,3) AS qty,
attr.struct_name,
attr.sect_code,
attr.sect_name,
@@ -218,7 +218,7 @@
sa.struct_code,
sa.struct_name,
sa.storagevehicle_code,
ROUND((ivt.canuse_qty * 1000) / unit_weight,3) AS qty
ROUND(ivt.canuse_qty / unit_weight,3) AS qty
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id