root/HuaYuJingMi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:一期内容优化；

Browse Source
This commit is contained in:
gongbaoxiong
2026-06-10 17:56:14 +08:00
parent eca0edad64
commit 02432faa17
27 changed files with 1500 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/StrategyStructParam.java
View File

@@ -33,6 +33,11 @@ public class StrategyStructParam {
*/
private String ext_type;
/**
* 起点
*/
private String point_code1;
/**
* 出入库类型
*/

14
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
View File

@@ -434,7 +434,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
.eq("sect_code", param.getSect_code())
).stream().findFirst().map(Structattr::getLayer_num).orElse(null);
if (maxLayerNum == null) {
maxLayerNum = 0;
maxLayerNum = 1;
}
List<String> strategy = one.getStrategy();
Map<String, Decisioner> decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class);
@@ -478,16 +478,24 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
.isNull("storagevehicle_code");
}
List<Structattr> list = this.list(query);
//特殊载具规则
if ("BCPCTZB".equals(param.getStoragevehicle_type()) || "DJQCT".equals(param.getStoragevehicle_type())) {
list = structattrMapper.getctnextcode();
}
if ("2FCP3C".equals(param.getStoragevehicle_type()) && ObjectUtil.isEmpty(list)) {
//只入234层
} else if ("DJQMZB".equals(param.getStoragevehicle_type())) {
list.removeIf(r -> r.getLayer_num().equals(1));
} else if ("2FCP3C".equals(param.getStoragevehicle_type()) && ObjectUtil.isEmpty(list)) {
query.eq("is_used", true)
.eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
.eq("sect_code", param.getSect_code())
.isNull("storagevehicle_code");
list = this.list(query);
}
//CNC点位不入4层
if (param.getPoint_code1().contains("BCPRK6")) {
Integer finalMaxLayerNum = maxLayerNum;
list.removeIf(r -> r.getLayer_num().equals(finalMaxLayerNum));
}
for (String decisionerType : strategy) {
Decisioner decisioner = decisionerMap.get(decisionerType);
log.info("执行入库规格:" + decisioner.strategyConfig.getStrategy_name());

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java
View File

@@ -597,6 +597,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
String iostorinvId = param.getString("iostorinv_id");
String storagevehicleCode = param.getString("storagevehicle_code");
String storagevehicle_stype = param.getString("storagevehicle_type");
String point_code1 = param.getString("point_code");
MdPbStoragevehicletype mdPbStoragevehicletype = iMdPbStoragevehicletypeService.getByCode(storagevehicle_stype);
//处理不同库区，一楼半成品特殊区域待检区
if ("DJQHDL".equals(storagevehicle_stype) || "DJQMZB".equals(storagevehicle_stype) || "DJQCT".equals(storagevehicle_stype)) {
@@ -642,6 +643,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
.suitable_car(suitable_car)
.strategyMaters(maters)
.storagevehicle_type(storagevehicle_stype)
.point_code1(point_code1)
.build());
Structattr struct = structattrs.get(0);
sect_id = struct.getSect_id();

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java
View File

@@ -354,8 +354,9 @@ public class WmsToIWmsServiceImpl implements WmsToIWmsService {
if (CollectionUtils.isNotEmpty(list)) {
for (SchBasePoint point : list) {
JSONObject pointData = new JSONObject();
pointData.put("barcode", StringUtils.isBlank(point.getVehicle_code()) ? "" : point.getVehicle_code());
pointData.put("point_code", point.getPoint_code());
pointData.put("status", point.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode()) && !point.getLock_up() ? "0" : "1");
pointData.put("status", point.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode()) && StringUtils.isBlank(point.getVehicle_code()) ? "0" : "1");
dataList.add(pointData);
}
}