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

init:一期二期代码合并

Browse Source
This commit is contained in:
zhangzq
2025-05-22 14:13:19 +08:00
parent 2dfe5f22de
commit ad7bfbfc7f
10 changed files with 215 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
View File

@@ -120,7 +120,6 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
void createSubTest(JSONObject jo);
List<JSONObject> recordQuery(List<String> pcsn);
/**
* 解绑子卷包装

4
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -819,10 +819,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
return this.baseMapper.getStructInfoBySZLS();
}
@Override
public List<JSONObject> recordQuery(List<String> pcsn) {
return this.baseMapper.recordQuery(pcsn);
}
@Override
public void boxReturn(JSONObject whereJson) {

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
View File

@@ -78,9 +78,6 @@ public class AutoSendZxToDjw extends Prun{
@Resource
private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
@Autowired
private ISysParamService iSysParamService;
//装箱区->装箱对接位agv自动搬运任务

18
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dto/StructAllsetDto.java Normal file
View File

@@ -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;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -43,7 +43,6 @@ import java.util.*;
@RequiredArgsConstructor
@Slf4j
public class StructivtServiceImpl implements StructivtService {
private final ClassstandardService classstandardService;
@Override
public Map<String, Object> 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 + "%");
}

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -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;

3
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
View File

@@ -334,4 +334,7 @@ public interface CheckOutBillService {
* }
*/
void saveUpdate(JSONObject whereJson);
void createOut(JSONObject struct);
void createMove(JSONObject struct);
}

10
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -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<String, JSONObject> Struct_map = new HashMap<String, JSONObject>();
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);
}
}
};

2
lms/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev
jackson:
time-zone: GMT+8
data: