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

opt:越南富佳优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-10-17 09:38:05 +08:00
parent 7c0758f3bc
commit fd45df13c6
4 changed files with 83 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
View File

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/wms")
@Slf4j
@SaIgnore
public class AcsToWmsController {
@Autowired
private AcsToWmsService acsToWmsService;

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -277,7 +277,9 @@ public class PdaIosInServiceImpl implements PdaIosInService {
@Override
public List<SelectItemVo> getSect(JSONObject whereJson) {
LambdaQueryWrapper<Sectattr> queryWrapper = new LambdaQueryWrapper<>(Sectattr.class)
.ne(Sectattr::getSect_type_attr,"09");
.ne(Sectattr::getSect_type_attr,"09")
.eq(Sectattr::getIs_delete,"0")
.eq(Sectattr::getIs_used,"1");
List<Sectattr> sectList = iSectattrService.list(queryWrapper);
List<SelectItemVo> selectList = new ArrayList<>();
sectList.forEach(r ->

15
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
View File

@@ -301,8 +301,19 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
} else if (executing_flag) {
mstDao.setBill_status(IOSEnum.MOVE_MST_STATUS.code("执行中"));
}
mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
mstDao.setUpdate_optid(currentUserId);
mstDao.setUpdate_optname(nickName);
mstDao.setUpdate_time(DateUtil.now());
this.updateById(mstDao);
}

76
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
View File

@@ -162,8 +162,20 @@ public class UpdateIvtUtils {
// 加冻结数
BigDecimal frozen_qty = extDao.getFrozen_qty().add(where.getBigDecimal("change_qty"));
extDao.setFrozen_qty(frozen_qty);
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
extDao.setUpdate_id(currentUserId);
extDao.setUpdate_name(nickName);
extDao.setUpdate_time(DateUtil.now());
extDao.setRemark(where.getString("remark"));
iMdPbGroupPlateService.updateById(extDao);
@@ -195,8 +207,19 @@ public class UpdateIvtUtils {
iMdPbStoragevehicleextService.removeById(extDao);
} else {
extDao.setFrozen_qty(frozen_qty);
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
extDao.setUpdate_id(currentUserId);
extDao.setUpdate_name(nickName);
extDao.setUpdate_time(DateUtil.now());
extDao.setRemark(where.getString("remark"));
iMdPbGroupPlateService.updateById(extDao);
@@ -225,9 +248,21 @@ public class UpdateIvtUtils {
throw new BadRequestException(LangBehavior.language("warehouse_manage.frozen_quantity_cannot_be_negative", String.valueOf(extDao.getFrozen_qty()), String.valueOf(where.getDoubleValue("change_qty"))));
}
// 加可用
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
extDao.setFrozen_qty(BigDecimal.ZERO);
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
extDao.setUpdate_id(currentUserId);
extDao.setUpdate_name(nickName);
extDao.setUpdate_time(DateUtil.now());
extDao.setRemark(where.getString("remark"));
iMdPbGroupPlateService.updateById(extDao);
@@ -248,8 +283,19 @@ public class UpdateIvtUtils {
}
BigDecimal canuse_qty = extDao.getQty().add(where.getBigDecimal("change_qty"));
extDao.setQty(canuse_qty);
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
extDao.setUpdate_id(currentUserId);
extDao.setUpdate_name(nickName);
extDao.setUpdate_time(DateUtil.now());
extDao.setRemark(where.getString("remark"));
iMdPbGroupPlateService.updateById(extDao);
@@ -278,8 +324,18 @@ public class UpdateIvtUtils {
iMdPbStoragevehicleextService.removeById(extDao);
}else {
extDao.setQty(canuse_qty);
extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
String currentUserId = "";
String nickName = "";
try {
currentUserId = SecurityUtils.getCurrentUserId();
nickName = SecurityUtils.getCurrentNickName();
}
catch (Exception e){
currentUserId = "OtherSys";
nickName= "OtherSys";
}
extDao.setUpdate_id(currentUserId);
extDao.setUpdate_name(nickName);
extDao.setUpdate_time(DateUtil.now());
extDao.setRemark(where.getString("remark"));
iMdPbGroupPlateService.updateById(extDao);