From ebe6d6f02789f90f70a47df9a30d914c2f55c9e7 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 6 Jul 2023 14:49:41 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=80=E4=BD=93=E6=9C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E9=87=8F=E4=B8=BAg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordermanage/service/saleOrder/dao/MpsSaleOrder.java | 1 + .../service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml | 2 +- .../iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml | 4 ++-- .../shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java | 3 ++- .../structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java index 2ffc8727..eba55a5f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java @@ -29,6 +29,7 @@ public class MpsSaleOrder implements Serializable{ /** * 销售单标识 */ + @TableId private Long sale_id; /** * 销售单号 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml index 7c32a430..2efa569e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml @@ -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 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml index 585da349..645eed43 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml @@ -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 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java index 26ee3db8..4abd11a7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java @@ -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 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; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index 2dc314c1..f7ddc998 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -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