From a02d635e6eaa63927d2b94cf5c81598f5a03a8da Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Wed, 16 Jul 2025 10:12:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=90=8C=E6=AD=A5=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=89=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StructattrServiceImpl.java | 19 ++++++++++++------- .../dao/mapper/xml/PmFormDataMapper.xml | 1 + .../nl/wms/sch_manage/enums/TaskStatus.java | 9 +++++++++ .../service/impl/OutBillServiceImpl.java | 1 + .../impl/RawAssistIStorServiceImpl.java | 19 ++++++++++++------- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index c2a2cb1..e47d22f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -39,7 +39,6 @@ import org.nl.wms.warehouse_manage.record.service.IStIvtStructivtflowService; import org.nl.wms.warehouse_manage.record.service.dao.StIvtStructivtflow; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; -import org.nl.wms.warehouse_manage.service.dao.IOStorInv; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,6 +52,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS; + /** * 仓位实现类 * @@ -405,12 +406,16 @@ public class StructattrServiceImpl extends ServiceImpl update = new UpdateWrapper() - .set("frozen_qty", 0) - .set("qty", subtract) - .set("update_time", now) - .eq("group_id", vehicleMater.getGroup_id()); - iMdPbGroupplateService.update(update); + //如果出库是手持库出确认则不在这边变动组盘信息 + if (!changeDto.getInBound()){ + UpdateWrapper update = new UpdateWrapper() + .set("frozen_qty", 0) + .set("qty", subtract) + .set("update_time", now) + .set("status", GROUP_PLATE_STATUS.code("组盘")) + .eq("group_id", vehicleMater.getGroup_id()); + iMdPbGroupplateService.update(update); + } StIvtStructivtflow record = new StIvtStructivtflow(); record.setId(IdUtil.getStringId()); record.setUpdate_time(now); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml index c7314a1..6117b92 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml @@ -111,6 +111,7 @@ SELECT pm_form_data.*, md_me_materialbase.material_code, + md_me_materialbase.material_id, md_me_materialbase.material_name, md_me_materialbase.material_spec, md_me_materialbase.net_weight diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/TaskStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/TaskStatus.java index c1414a4..948b804 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/TaskStatus.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/TaskStatus.java @@ -73,4 +73,13 @@ public enum TaskStatus { public void setDesc(String desc) { this.desc = desc; } + + public static String convertName(String code){ + for (TaskStatus value : TaskStatus.values()) { + if (value.getCode().equals(code)){ + return value.getName(); + } + } + return ""; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java index 76327f7..6d62f69 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java @@ -434,6 +434,7 @@ public class OutBillServiceImpl extends ServiceImpl i ioStorInvDisMapper.insert(ioStorInvDis); allocation_canuse_qty = allocation_canuse_qty.add(outAllocation.getFrozen_qty()); //分配完成 结束分配 + unassign_qty=unassign_qty.subtract(allocation_canuse_qty); if (unassign_qty.doubleValue() <= 0){ break; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java index d6835de..54ffc64 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java @@ -349,7 +349,18 @@ public class RawAssistIStorServiceImpl extends ServiceImpl structattrs = iStructattrService.inBoundSectDiv( + StrategyStructParam.builder() + .ioType(param.getString("ioType")) + .sect_code(param.getString("sect_code")) + .stor_code(param.getString("stor_code")) + .material_code(param.getString("material_code")) + .qty(new BigDecimal(param.getString("qty"))) + .pcsn(param.getString("pcsn")) + .build()); + Structattr struct = structattrs.get(0); + + sect_id = struct.getSect_id(); sect_code = struct.getSect_code(); sect_name = struct.getSect_name(); @@ -361,12 +372,6 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(MdPbStoragevehicleinfo.class) .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, map.get("storagevehicle_code")) ); - //判断仓位的长高宽是否能放下载具 - // if (structattr.getWidth() < 0 && - // structattr.getHeight() < 0 && - // structattr.getZdepth() < 0) { - // throw new BadRequestException("载具不符合，请检查!"); - // } sect_id = map.get("sect_id"); sect_code = map.get("sect_code"); sect_name = map.get("sect_name");