From 3a22a1fd3b3ff9c4730b50c2785a2cfa79d42317 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Mon, 29 Jun 2026 19:33:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=8D=95=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E6=94=B6=EF=BC=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/wms-server/pom.xml | 2 +- .../controller/MesToWmsController.java | 8 ++++-- .../work_order/WorkOrderController.java | 2 +- .../impl/ProductGroupServiceImpl.java | 4 +-- .../service/work_order/IWorkOrderService.java | 2 +- .../dao/mapper/WorkOrderMapper.java | 2 ++ .../work_order/dao/mapper/WorkOrderMapper.xml | 4 +++ .../work_order/impl/WorkOrderServiceImpl.java | 25 ++++++++++--------- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/nladmin-system/wms-server/pom.xml b/nladmin-system/wms-server/pom.xml index 1574d47..d234e71 100644 --- a/nladmin-system/wms-server/pom.xml +++ b/nladmin-system/wms-server/pom.xml @@ -219,7 +219,7 @@ com.oracle.database.jdbc ojdbc8 - 23.9.0.25.07 + 19.8.0.0 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 8cb9b96..88d4a3a 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 @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; +import java.util.List; @RestController @RequestMapping("/api/mes") @@ -35,8 +36,11 @@ public class MesToWmsController { @PostMapping("/subWorkOrder") @SaIgnore - public ResponseEntity subWorkOrder(@RequestBody WorkOrderDto dto){ - iWorkOrderService.insert(dto); + public ResponseEntity subWorkOrder(@RequestBody List dtos){ + for (WorkOrderDto.WorkOrderDataDto dto : dtos) { + iWorkOrderService.insert(dto); + } + return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java index 34c62fa..f6af14f 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java @@ -48,7 +48,7 @@ public class WorkOrderController { @Log("保存工单") public ResponseEntity save(@Validated @RequestBody WorkOrderDto dto) { - iWorkOrderService.insert(dto); + iWorkOrderService.insert(dto.getWorkOrder()); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java index e4051d1..076b7c8 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java @@ -53,11 +53,11 @@ public class ProductGroupServiceImpl implements IProductGroupService { GroupPlateMapper.updateGroupPalletById(jsonObjects.get(0).getString("group_id"), bomData.getUseBomQty()); continue; } - + String loadPortCode = dto.getLoadPort().split(":")[0]; JSONObject json = new JSONObject(); json.put("group_id", IdUtil.getStringId()); json.put("ext_code", dto.getWorkOrder()); - json.put("load_port", dto.getLoadPort()); + json.put("load_port", loadPortCode); json.put("storagevehicle_code", dto.getPalletCode()); json.put("material_id", bomData.getMaterialCode()); json.put("material_code", bomData.getMaterialCode()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java index dc3e866..0008ca0 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java @@ -25,7 +25,7 @@ public interface IWorkOrderService extends IService { * 新增工单 * @param entity */ - void insert(WorkOrderDto entity); + void insert(WorkOrderDto.WorkOrderDataDto entity); /** * 修改工单状态 diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java index 5408808..9a550f1 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java @@ -47,4 +47,6 @@ public interface WorkOrderMapper extends BaseMapper { * 修改对应bom使用数量 */ void updateBomUseQty(String id, BigDecimal qty); + + void deleteByOrderCode(String orderCode); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml index 8f7e562..aa7bb52 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml @@ -50,6 +50,10 @@ UPDATE md_work_order_bom SET use_bom_qty = use_bom_qty + #{qty} WHERE id = #{id} + + delete from md_work_order_bom + where work_order_code = #{orderCode} +