From a1941577f03b8be4c6de2706c0567ab6a14bab8b Mon Sep 17 00:00:00 2001 From: zhoujj <1549112868@qq.com> Date: Tue, 17 Mar 2026 14:15:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/quartz/task/AutoCreateInst.java | 10 +++++++ .../service/dao/Structattr.java | 7 +++-- .../service/dao/mapper/StructattrMapper.java | 2 ++ .../service/dao/mapper/StructattrMapper.xml | 26 +++++++++++++++++++ .../service/dto/StrategyStructParam.java | 5 +++- .../MdPbStoragevehicleinfoServiceImpl.java | 2 +- .../service/impl/StructattrServiceImpl.java | 11 ++++++-- .../controller/SchBaseRegionController.java | 7 ++++- .../service/ISchBaseRegionService.java | 6 +++++ .../service/impl/InBillServiceImpl.java | 1 + .../service/impl/OutBillServiceImpl.java | 13 ++++++---- .../service/impl/WmsToIWmsServiceImpl.java | 3 ++- nladmin-ui/src/views/wms/sch/point/index.vue | 24 ++++++++++------- .../src/views/wms/sch/region/schBaseRegion.js | 8 +++++- 14 files changed, 101 insertions(+), 24 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 810791c..24db7b3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -152,8 +152,18 @@ public class AutoCreateInst { flag = true; } } + } else if (start_point.equals("BCPRK5")) { + List list1 = taskserver.queryAllByStatus("1"); + for (int j = 0; j < list1.size(); j++) { + String start_device_code1 = list1.get(j).getStart_device_code(); + String[] parts = start_device_code1.split("-", 2); + start_point = parts[0]; + if (start_point.equals("BCPRK5")) { + flag = true; + } } } + } if (flag){ continue; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java index 4009b7a..a63eb4d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java @@ -225,8 +225,11 @@ public class Structattr implements Serializable { private String ext_id; /** - * 备注 + * 关联货位1 */ private String remark; - + /** + * 关联货位2 + */ + private String remark1; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java index 75ab678..13cecf1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java @@ -17,4 +17,6 @@ public interface StructattrMapper extends BaseMapper{ List collectVehicle(Map query); + List getctnextcode(); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml index 3028084..8dc8daf 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml @@ -56,4 +56,30 @@ + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java index f9e3f02..f05de94 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java @@ -48,6 +48,9 @@ public class StrategyStructParam { * 载具明细：混料的话则是数组 */ private List strategyMaters; - + /** + * 载具类型 + */ + private String storagevehicle_type; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java index 209a4c0..5d81915 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -94,7 +94,7 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl strategy = one.getStrategy(); Map decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class); QueryWrapper query = new QueryWrapper(); - if ("3".equals(param.getSuitable_car())) { + if ("3".equals(param.getSuitable_car())) { query.eq("is_used", true) .eq("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")) .eq("sect_code", param.getSect_code()) - .ne("width",1) + .isNull( "width") + .ne("stor_type",1) .and(wrapper -> wrapper.isNull("storagevehicle_code") .or() .eq("storagevehicle_code", " ")); @@ -373,6 +374,7 @@ public class StructattrServiceImpl extends ServiceImpl wrapper.isNull("storagevehicle_code") .or() .eq("storagevehicle_code", " ")); @@ -381,11 +383,16 @@ public class StructattrServiceImpl extends ServiceImpl wrapper.isNull("storagevehicle_code") .or() .eq("storagevehicle_code", " ")); } List list = this.list(query); + if("BCPCTZB".equals(param.getStoragevehicle_type())){ + list=structattrMapper.getctnextcode(); + } + for (String decisionerType : strategy) { Decisioner decisioner = decisionerMap.get(decisionerType); log.info("执行入库规格:"+decisioner.strategyConfig.getStrategy_name()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBaseRegionController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBaseRegionController.java index 1b4fff5..8ad3875 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBaseRegionController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBaseRegionController.java @@ -41,7 +41,12 @@ public class SchBaseRegionController { regionService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } - + @PostMapping("/relse") + @Log("释放出库区域") + public ResponseEntity relse() { + regionService.relse(); + return new ResponseEntity<>(HttpStatus.OK); + } @PutMapping @Log("修改区域管理") public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseRegionService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseRegionService.java index 6894cb0..c446ae7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseRegionService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseRegionService.java @@ -46,6 +46,12 @@ public interface ISchBaseRegionService extends IService { * @param ids / */ void deleteAll(Set ids); + /** + * 释放出库区域 + * + * + */ + void relse(); /** * 区域下拉框 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index d2fbf8c..d50229a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -635,6 +635,7 @@ public class InBillServiceImpl extends ServiceImpl i .sect_code(param.getString("sect_code")) .stor_code(param.getString("stor_code")) .storagevehicle_code(param.getString("storagevehicle_code")) + .storagevehicle_type(param.getString("storagevehicle_type")) .suitable_car(suitable_car) .strategyMaters(maters) .build()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 22fabb9..d92ffb9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -21,12 +21,10 @@ import org.nl.common.utils.IdUtil;; import org.nl.config.SpringContextHolder; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IBsrealStorattrService; +import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; import org.nl.wms.basedata_manage.service.IMdPbStoragevehicletypeService; import org.nl.wms.basedata_manage.service.IStructattrService; -import org.nl.wms.basedata_manage.service.dao.BsrealStorattr; -import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; -import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicletype; -import org.nl.wms.basedata_manage.service.dao.Structattr; +import org.nl.wms.basedata_manage.service.dao.*; import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper; import org.nl.wms.basedata_manage.service.dto.*; @@ -54,6 +52,7 @@ import org.nl.wms.warehouse_manage.inAndOut.service.dto.IOStorInvDisDto; import org.nl.wms.warehouse_manage.inAndOut.service.dto.IOStorInvDtlDto; import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; import org.nl.wms.wbwms.service.IWmsToWmsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -86,6 +85,8 @@ public class OutBillServiceImpl extends ServiceImpl i */ @Resource private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper; + @Resource + private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; /** * 任务服务 @@ -1184,7 +1185,9 @@ public class OutBillServiceImpl extends ServiceImpl i structattr=iStructattrService.getByCode(struct_code); if(structattr.getLayer_num().equals(4)){ car_type="2"; - String storagevehicle_stype=(String) whereJson.get("storagevehicle_type"); + String storagevehicle_code=structattr.getStoragevehicle_code(); + MdPbStoragevehicleinfo mdPbStoragevehicleinfo=iMdPbStoragevehicleinfoService.getByCode(storagevehicle_code); + String storagevehicle_stype=mdPbStoragevehicleinfo.getStoragevehicle_type(); MdPbStoragevehicletype mdPbStoragevehicletype=iMdPbStoragevehicletypeService.getByCode(storagevehicle_stype); car_width=mdPbStoragevehicletype.getCar_width(); }else{ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java index 876ff8b..46630e0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java @@ -268,12 +268,13 @@ public class WmsToIWmsServiceImpl implements WmsToIWmsService { parm.put("point_code",stuct_code); parm.put("region_code","CKQ"); iOutBillService.allSetPoint(parm); - JSONObject data=new JSONObject(); + // data.put("bill_code",iostorinv_id); // data.put("turnout_destination_code",pointCode); result.setCode(String.valueOf(HttpStatus.OK.value())); result.setMsg("出库任务生成成功"); result.setTotalElements(0); + JSONObject data=new JSONObject(); result.setData(data); log.info("WMS出库返回参数参数为：-------------------" + result.toString()); return result; diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue index 0e9a4ca..98b9840 100644 --- a/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/nladmin-ui/src/views/wms/sch/point/index.vue @@ -122,16 +122,16 @@ > 启用 - - - - - - - - - - + 一键解锁出库点 + { if (flag === 1) { @@ -531,6 +534,7 @@ export default { this.crud.toQuery() }) }, + showButton(point_status) { if (point_status && (point_status === '2' || point_status === '3')) { return true diff --git a/nladmin-ui/src/views/wms/sch/region/schBaseRegion.js b/nladmin-ui/src/views/wms/sch/region/schBaseRegion.js index ec87f8a..699cb19 100644 --- a/nladmin-ui/src/views/wms/sch/region/schBaseRegion.js +++ b/nladmin-ui/src/views/wms/sch/region/schBaseRegion.js @@ -47,5 +47,11 @@ export function getPointTypeSelectById(id) { data: id }) } +export function relse() { + return request({ + url: 'api/schBaseRegion/relse', + method: 'post', + }) +} -export default { add, edit, del, getRegionList, getPointStatusSelectById, getPointTypeSelectById } +export default { add, edit, del, getRegionList, getPointStatusSelectById, getPointTypeSelectById, relse }