From ab9af970eabecb7f6e5c19e712fc6b2604ddd40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Oct 2025 15:06:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E4=B8=BA=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/admin/controller/OutCostCenterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 2312f7fb..a37d9085 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -228,7 +228,7 @@ public class OutCostCenterController extends BaseController { .setSerialNo(qrCodeContent.getSerialNo()) .setUniqNo(qrCodeContent.getUniqNo()) .setFactoryNo(order.getWerks()) - .setWarehouseNo(item.getLgort()) + .setWarehouseNo(request.getLgort()) .setNum(qrCodeContent.getNum()) .setCreateBy(UserUtil.getUserName()) .setCreateTime(Instant.now()) From 303cd1164edd208ee6b9ea70daeec9ade31ec9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Oct 2025 14:03:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9B=B6=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=87=BA=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WmsComponentPackingMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml index 058fa3aa..5c412a41 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml @@ -8,7 +8,7 @@ from wms_component_packing - and no ilike concat('%', #{request.no}, '%') + and "no" ilike concat('%', #{request.no}, '%') and name1 ilike concat('%', #{request.name1}, '%') @@ -41,7 +41,7 @@ from wms_component_packing where is_completed=0 - and （no like concat('%', #{no}, '%') or vbelv like concat('%', #{no}, '%')） + and ("no" like concat('%', #{no}, '%') or vbelv like concat('%', #{no}, '%')) order by datum desc From 0a623b70e41b47fb419f80806ac788394b2da976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Oct 2025 14:07:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BB=93=E5=BA=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java | 5 +++++ .../src/main/resources/mapper/WmsWarehouseMapper.xml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java index 7e07000f..86fc91a8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java @@ -19,4 +19,9 @@ public class WarehouseSearchQO extends PageQO{ * 启用状态 */ private Boolean enable; + + /** + * 工厂编号 + */ + private String factoryNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml index fbd7e3b2..e1cf1277 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml @@ -16,6 +16,9 @@ and w.name ilike concat('%',#{request.name},'%') + + and di.code ilike concat('%',#{request.factoryNo},'%') + order by w.id desc From 0b399d3ef66b551ef0cb81f170bc339e476fbf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 10 Oct 2025 17:06:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20bug-764=20=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java | 2 ++ .../wms/admin/pojo/document/InventoryCheckTaskScanRecord.java | 2 ++ .../com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java | 2 ++ .../nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java index 1c54b0a6..79ae23ab 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.pojo.document; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.data.annotation.Id; @@ -113,6 +114,7 @@ public class InMaterialScanRecord { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Instant createTime; @Transient diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java index 00c733b6..7776068a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.pojo.document; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; @@ -76,5 +77,6 @@ public class InventoryCheckTaskScanRecord { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Instant createTime; } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java index c19e9809..4e2390db 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.pojo.document; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.data.annotation.Id; @@ -112,6 +113,7 @@ public class OutMaterialScanRecord { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Instant createTime; @Transient diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java index a22ef7e3..ad1f26a1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.pojo.document; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.data.annotation.Id; @@ -79,5 +80,6 @@ public class PackageMaterialScanRecord { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Instant createTime; } \ No newline at end of file