From 26d74cb19d6dd9eeba090fe24a363ea88defbcf2 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 17 Jun 2026 14:32:28 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=94=9F=E4=BA=A7=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BC=BA=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/utils/SecurityUtils.java | 11 +-- .../service/dto/StrategyStructParam.java | 4 -- .../service/impl/StructattrServiceImpl.java | 4 +- .../decisioner/impl/base/FIFORuleHandler.java | 1 - .../decisioner/impl/diy/FIFO2RuleHandler.java | 1 - .../impl/diy/FIFONoStorHandler.java | 1 - .../controller/MesStructLineController.java | 4 +- .../service/impl/PdaIosInServiceImpl.java | 1 - .../service/impl/PdaIosOutServiceImpl.java | 1 - .../service/impl/PdaSchPointServiceImpl.java | 2 +- .../service/impl/PurchaseServiceImpl.java | 2 +- ...ineTask.java => StructOfflineService.java} | 69 ++++++------------- .../sch_manage/service/dao/SchBasePoint.java | 35 ---------- .../service/impl/SchBasePointServiceImpl.java | 30 -------- .../service/impl/SchBaseTaskServiceImpl.java | 4 -- .../service/impl/InBillServiceImpl.java | 1 - .../service/impl/OutBillServiceImpl.java | 2 - 17 files changed, 35 insertions(+), 138 deletions(-) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/{StructOfflineTask.java => StructOfflineService.java} (81%) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/nladmin-system/wms-server/src/main/java/org/nl/common/utils/SecurityUtils.java index 7283689..983dadd 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/common/utils/SecurityUtils.java @@ -23,12 +23,15 @@ public class SecurityUtils { * @return 系统用户 */ public static CurrentUser getCurrentUser() { - Object loginInfo = StpUtil.getExtra("loginInfo"); - if (loginInfo==null){ + try { + Object loginInfo = StpUtil.getExtra("loginInfo"); + if (loginInfo==null){ + return CurrentUser.getDefaultUser(); + } + return JSONObject.parseObject(String.valueOf(loginInfo),CurrentUser.class); + }catch (Exception ex){ return CurrentUser.getDefaultUser(); } - return JSONObject.parseObject(String.valueOf(loginInfo),CurrentUser.class); - } /** diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java index 764c6da..e422199 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java @@ -16,10 +16,6 @@ public class StrategyStructParam { *库区，暂时不用 */ private String sect_code; - /** - * 仓位编码 - */ - private String stor_code; /** * 同步单号 */ diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 8c5b751..7d47577 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -318,7 +318,7 @@ public class StructattrServiceImpl extends ServiceImpl outBoundSectDiv(StrategyStructParam param) { //只校验仓库，库区 - Assert.noNullElements(new Object[]{param.getStor_code(),param.getSect_code()},"请求参数不能为空"); + Assert.noNullElements(new Object[]{param.getSect_code()},"请求参数不能为空"); StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper() .eq(StSectStrategy::getSect_code, param.getSect_code()) .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("出库"))); @@ -348,7 +348,7 @@ public class StructattrServiceImpl extends ServiceImpl inBoundSectDiv(StrategyStructParam param) { //批号，单据暂时不校验，具体业务具体校验 - Assert.noNullElements(new Object[]{param.getStrategyMaters(),param.getStor_code(),param.getSect_code()},"请求参数不能为空"); + Assert.noNullElements(new Object[]{param.getStrategyMaters(),param.getSect_code()},"请求参数不能为空"); StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper() .eq(StSectStrategy::getSect_code, param.getSect_code()) .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("入库"))); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/FIFORuleHandler.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/FIFORuleHandler.java index 515fcc9..7696f9c 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/FIFORuleHandler.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/FIFORuleHandler.java @@ -45,7 +45,6 @@ public class FIFORuleHandler extends Decisioner vechielDtos = iStructattrService.collectVechicle(MapOf.of("material_id", strategyMater.getMaterial_id() , "pcsn", strategyMater.getPcsn() - , "stor_code", param.getStor_code() , "sect_code", param.getSect_code() , "plan_qty", planQty , "is_lock", "false" diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFO2RuleHandler.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFO2RuleHandler.java index 7cc8b65..31d63a7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFO2RuleHandler.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFO2RuleHandler.java @@ -45,7 +45,6 @@ public class FIFO2RuleHandler extends Decisioner vechielDtos = iStructattrService.collectVechicle(MapOf.of("material_id", strategyMater.getMaterial_id() , "pcsn", strategyMater.getPcsn() - , "stor_code", param.getStor_code() , "sect_code", param.getSect_code() , "plan_qty", planQty , "is_lock", "false" diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesStructLineController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesStructLineController.java index b33115d..0c0a9c0 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesStructLineController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesStructLineController.java @@ -5,7 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext_manage.service.dto.StructLineOfflineDTO; -import org.nl.wms.sch_manage.service.core.tasks.StructOfflineTask; +import org.nl.wms.sch_manage.service.core.tasks.StructOfflineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; public class MesStructLineController { @Autowired - private StructOfflineTask structOfflineTask; + private StructOfflineService structOfflineTask; /** * 结构车间生产下料同步接口 diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index e6a0475..4e4c28e 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -330,7 +330,6 @@ public class PdaIosInServiceImpl implements PdaIosInService { StrategyStructParam.builder() .ioType(StatusEnum.STRATEGY_TYPE.code("入库")) .sect_code(whereJson.getString("sect_code")) - .stor_code(storeDao.getStor_code()) .storagevehicle_code(vehicleDao.getStoragevehicle_code()) .strategyMaters(materss) .build()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index b7dda31..12a4a05 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -362,7 +362,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { StrategyStructParam strategyStructParam = StrategyStructParam.builder() .ioType(whereJson.getString(StatusEnum.STRATEGY_TYPE.code("出库"))) .sect_code(whereJson.getString("sect_code")) - .stor_code(whereJson.getString("stor_code")) .strategyMaters(maters) .build(); List structList = iStructattrService.outBoundSectDiv(strategyStructParam); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java index abd0337..247e104 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java @@ -32,7 +32,7 @@ public class PdaSchPointServiceImpl extends ServiceImpl() + .eq(IOStorInvDis::getIostorinv_id, iostorinv_id) + .select(IOStorInvDis::getIostorinvdis_id)); Map divPointParam = new HashMap<>(); divPointParam.put("point_code", offlineDTO.getUnloadPort()); ArrayList> tableMater = new ArrayList<>(); HashMap materRow = new HashMap<>(); materRow.put("iostorinv_id", iostorinv_id); // 入库单明细ID - materRow.put("iostorinvdis_id", iostorinvdis_id); // 分配明细ID（如果有） + materRow.put("iostorinvdis_id", ioStorInvDis.getIostorinvdis_id()); // 分配明细ID（如果有） materRow.put("storagevehicle_code", storagevehicleCode); // 载具编码 tableMater.add(materRow); divPointParam.put("tableMater", tableMater); iInBillService.divPoint(divPointParam); } - - @Override - public String create(JSONObject json) { - - - String task_id = stInTask.create(task_form); - return null; - } - - @Override - public AcsTaskDto sendAcsParam(String taskId) { - return null; - } - - @Override - protected void updateStatus(String task_code, TaskStatus status) { - - } - - @Override - public void forceFinish(String task_code) { - - } - - @Override - public void cancel(String task_code) { - - } - } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java index 20e26a2..d6d7c3b 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java @@ -124,39 +124,4 @@ public class SchBasePoint implements Serializable { private String update_time; private String ios_id; - - @TableField(exist = false) - private List can_vehicle_types; - - @TableField(exist = false) - private String point_type_name; - - @TableField(exist = false) - private String point_status_name; - - // 组盘标识 - @TableField(exist = false) - private String group_id; - - @TableField(exist = false) - private String record_id; - - @TableField(exist = false) - private String device_code; - @TableField(exist = false) - private String material_qty; - @TableField(exist = false) - private String material_code; - @TableField(exist = false) - private String material_name; - @TableField(exist = false) - private String material_spec; - @TableField(exist = false) - private String material_model; - @TableField(exist = false) - private String raw_material_code; - @TableField(exist = false) - private String task_warn; - @TableField(exist = false) - private String storagevehicle_code; } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index c9ff4a1..599728b 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -59,27 +59,6 @@ public class SchBasePointServiceImpl extends ServiceImpl queryAll(SchBasePointQuery whereJson, PageQuery page) { IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pages = pointMapper.selectPageLeftJoin(pages, whereJson); - // 可以存放的载具类型 - pages.getRecords().forEach(point -> { - if (ObjectUtil.isNotEmpty(point.getCan_vehicle_type())) { - point.setCan_vehicle_types(Arrays.asList(point.getCan_vehicle_type().split(","))); - } - String pointStatus = point.getPoint_status(); // 点位状态 - String pointType = point.getPoint_type(); // 点位类型 - SchBaseRegion regionObj = regionMapper.selectById(point.getRegion_code()); - if (ObjectUtil.isNotEmpty(regionObj)) { - if (ObjectUtil.isNotEmpty(pointStatus) && ObjectUtil.isNotEmpty(regionObj.getPoint_status_explain())) { - // 设置 - point.setPoint_status_name(PointUtils.getStatusOrTypeName( - regionObj.getPoint_status_explain(), pointStatus)); - } - if (ObjectUtil.isNotEmpty(pointType) && ObjectUtil.isNotEmpty(regionObj.getPoint_type_explain())) { - // 设置 - point.setPoint_type_name(PointUtils.getStatusOrTypeName( - regionObj.getPoint_type_explain(), pointType)); - } - } - }); return pages; } @@ -97,11 +76,6 @@ public class SchBasePointServiceImpl extends ServiceImpl i StrategyStructParam.builder() .ioType(StatusEnum.STRATEGY_TYPE.code("入库")) .sect_code(param.getString("sect_code")) - .stor_code(param.getString("stor_code")) .storagevehicle_code(param.getString("storagevehicle_code")) .strategyMaters(maters) .build()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 9b7ba65..973cbef 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -397,7 +397,6 @@ public class OutBillServiceImpl extends ServiceImpl i list.add(mater); List structMaterials = iStructattrService.outBoundSectDiv( StrategyStructParam.builder() - .stor_code(ioStorInv.getStor_code()) .sect_code(sectCode) .strategyMaters(list) .build() @@ -572,7 +571,6 @@ public class OutBillServiceImpl extends ServiceImpl i //调用分配规则获取分配的库位:如果库存不足则直接报错 List structMaterials = iStructattrService.outBoundSectDiv( StrategyStructParam.builder() - .stor_code(ioStorInv.getStor_code()) .sect_code(sectCode) .inv_code(ioStorInv.getBill_code()) .strategyMaters(list)