diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java index 2f31953a9..bbcab9764 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java @@ -120,7 +120,6 @@ public interface IpdmBiSubpackagerelationService extends IService recordQuery(List pcsn); /** * 解绑子卷包装 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 93eebaa22..c640c03de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -819,10 +819,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl recordQuery(List pcsn) { - return this.baseMapper.recordQuery(pcsn); - } @Override public void boxReturn(JSONObject whereJson) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index 63260e281..d63b5be66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -78,9 +78,6 @@ public class AutoSendZxToDjw extends Prun{ @Resource private BstIvtBoxinfoMapper bstIvtBoxinfoMapper; - @Autowired - private ISysParamService iSysParamService; - //装箱区->装箱对接位agv自动搬运任务 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dto/StructAllsetDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dto/StructAllsetDto.java new file mode 100644 index 000000000..a479caa4b --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dto/StructAllsetDto.java @@ -0,0 +1,18 @@ +package org.nl.b_lms.storage_manage.ios.service.iostorInv.dto; + +import lombok.Data; + +/** + * 条件 + * @author LXY + * @Date 2023/11/10 14:49 + */ +@Data +public class StructAllsetDto { + private String sect_id; + private String struct_code; + private String placement_type; + private String block_num; + private String row_num; + private String out_order_seq; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index 674a67c0e..65df59c5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -43,7 +43,6 @@ import java.util.*; @RequiredArgsConstructor @Slf4j public class StructivtServiceImpl implements StructivtService { - private final ClassstandardService classstandardService; @Override public Map queryAll(Map whereJson, Pageable page, String[] product_area, String[] ivt_flag) { @@ -143,7 +142,6 @@ public class StructivtServiceImpl implements StructivtService { map.put("is_virtual", is_virtual); map.put("sub_type", sub_type); map.put("quality_scode", quality_scode); - map.put("control", control); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 005b3b2b1..c6457b60e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -11,9 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.google.common.collect.Interner; -import com.google.common.collect.Interners; import lombok.RequiredArgsConstructor; +import org.nl.b_lms.sch.tasks.slitter.service.SlitterService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -37,7 +36,6 @@ import org.nl.b_lms.sch.tasks.TwoBoxExcepTask; import org.nl.b_lms.sch.tasks.TwoExceptionInTask; import org.nl.b_lms.sch.tasks.first_floor_area.MzhcwTask; import org.nl.b_lms.sch.tasks.first_floor_area.SsxDjwTask; -import org.nl.b_lms.sch.tasks.slitter.service.SlitterService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; @@ -51,6 +49,7 @@ import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.enums.SpecEnum; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.MapOf; +import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; @@ -172,8 +171,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Resource private SsxDjwTask ssxDjwTask; - @Autowired - private IMdpbBoxtypeService iMdpbBoxtypeService; @Autowired private ISysParamService iSysParamService; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java index 0081d9f43..7255a81ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java @@ -334,4 +334,7 @@ public interface CheckOutBillService { * } */ void saveUpdate(JSONObject whereJson); + + void createOut(JSONObject struct); + void createMove(JSONObject struct); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 8f09d98bf..7fd2e2e89 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -53,6 +53,8 @@ import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl; import org.nl.wms.util.TranUtil; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -86,6 +88,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { private final RedissonClient redissonClient; private final ISysUserDeptService iSysUserDeptService; private final IStIvtIostorinvdisService iStIvtIostorinvdisService; + @Autowired + @Lazy + private CheckOutBillService checkOutBillService; @Override @@ -1580,7 +1585,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr"); //定义需要更新的仓位集合 - HashMap Struct_map = new HashMap(); String iostorinv_id = whereJson.getString("iostorinv_id"); //查询主表信息 JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); @@ -3281,14 +3285,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } if (needStructList.contains(structCode)){ //出库 - this.createOut(item); + checkOutBillService.createOut(item); needStructList.remove(structCode); }else { //移库:如果当前存在业务锁定则说明存在相关任务,不需要移库,直接跳过 if (!item.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))){ continue; } - this.createMove(item); + checkOutBillService.createMove(item); } } }; diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a9fc87884..a435e1108 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index4.html b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index4.html new file mode 100644 index 000000000..011048949 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index4.html @@ -0,0 +1,184 @@ + + + + + + 智能仓储监控看板 + + + +

装箱区点位监控系统

+
+ + + +