From 42534bd22e009e0d6a697a15a51aec7d87e9c465 Mon Sep 17 00:00:00 2001
From: zhaoyf <1783123481@qq.com>
Date: Fri, 17 Jul 2026 19:17:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=8D=95=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAstring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext_manage/controller/MesToWmsController.java  | 2 +-
 .../wms/sch_manage/service/core/tasks/LineCallFullTask.java   | 2 +-
 .../service/work_order/dao/WorkOrderBomDao.java               | 2 +-
 .../welding_manage/service/work_order/dao/WorkOrderDao.java   | 4 +---
 .../welding_manage/service/work_order/dto/WorkOrderDto.java   | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
index 3463df9..0315c9f 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
@@ -74,7 +74,7 @@ public class MesToWmsController {
     @SaIgnore
     @Log("工单同步")
     public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){
-        String[] filter = {"E301050","E301100"};//过滤产线
+        String[] filter = {};//过滤产线
         for (WorkOrderDto.WorkOrderDataDto dto : dtos) {
             if (ArrayUtils.contains(filter, dto.getWorkArea())){
                 iWorkOrderService.insert(dto);
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/LineCallFullTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/LineCallFullTask.java
index 879c919..8bfd22c 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/LineCallFullTask.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/LineCallFullTask.java
@@ -207,7 +207,7 @@ public class LineCallFullTask extends AbstractTask {
                     entry.setUnitno(orderBomItem.getUnit());
                     entry.setQty(plate.getQty());
                     entry.setBaseqty(orderBomItem.getBom_qty());
-                    entry.setWarehouseno(orderBomItem.getWarehouse_code().stripTrailingZeros().toPlainString());
+                    entry.setWarehouseno(orderBomItem.getWarehouse_code());
                     entry.setSrcbillno(workOrder.getOrder_code());
                     entry.setSrcbillid(workOrder.getOrder_id());
                     entry.setSrcbillentryid(orderBomItem.getItem_id());
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java
index 881d625..9652fa1 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java
@@ -39,7 +39,7 @@ public class WorkOrderBomDao {
 
     private String sup_org_code;
 
-    private BigDecimal warehouse_code;
+    private String warehouse_code;
 
     private String warehouse_name;
 
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java
index 4068633..d7e4e6d 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java
@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("md_work_order")
@@ -37,7 +35,7 @@ public class WorkOrderDao {
 
     private String plan_finished_on;
 
-    private BigDecimal default_warehouse_code;
+    private String default_warehouse_code;
 
     private String default_warehouse_name;
 
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java
index 106b9ad..e8ae68a 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java
@@ -73,7 +73,7 @@ public class WorkOrderDto implements Serializable {
         private String planFinishedOn;
 
         @JsonProperty("DefaultWarehouseCode")
-        private BigDecimal defaultWarehouseCode;
+        private String defaultWarehouseCode;
 
         @JsonProperty("DefaultWarehouseName")
         private String defaultWarehouseName;
@@ -259,7 +259,7 @@ public class WorkOrderDto implements Serializable {
             private String supOrgCode;
 
             @JsonProperty("WarehouseCode")
-            private BigDecimal warehouseCode;
+            private String warehouseCode;
 
             @JsonProperty("WarehouseName")
             private String warehouseName;