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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-07-22 17:47:03 +08:00
parent 1cdf3ee430 fb77c78ea6
commit d1a0ad4234
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -987,6 +987,8 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
paramMap.put("detail_count",disDaoList.size());
paramMap.put("bill_type",IOSEnum.IN_TYPE.code("调拨入库"));
paramMap.put("biz_date",DateUtil.today());
paramMap.put("out_stor_id",mstDao.getStor_id());
paramMap.put("source_id",dtlDao.getVbeln());
paramMap.put("remark", "");
// 明细数据

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -684,6 +684,8 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
.is_upload(IOSEnum.IS_NOTANDYES.code("否"))
.syscompanyid(SecurityUtils.getDeptId())
.sysdeptid(SecurityUtils.getDeptId())
.out_stor_id(Long.parseLong(MapUtil.getStr(whereJson, "out_stor_id")))
.source_id(Long.parseLong(MapUtil.getStr(whereJson, "source_id")))
.build();
} else {
// 修改

30
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java
View File

@@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
@@ -38,6 +40,9 @@ public class RecutPlanServiceImpl implements RecutPlanService {
private final CheckOutBillService checkOutBillService;
@Autowired
private IStIvtIostorinvOutService iStIvtIostorinvOutService;
@Autowired
private ISysUserService iSysUserService;
@@ -273,13 +278,26 @@ public class RecutPlanServiceImpl implements RecutPlanService {
}
if (!dtls.isEmpty()) {
jsonMst.put("tableData", dtls);
String iostorinv_id = checkOutBillService.insertDtl(jsonMst);
// 判断仓库是否是二期仓库
if (mst_jo.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
jsonMst.put("tableData", dtls);
String iostorinv_id = iStIvtIostorinvOutService.insertMst(jsonMst);
//调用自动分配
JSONObject out_jo = new JSONObject();
out_jo.put("iostorinv_id", iostorinv_id);
out_jo.put("div_type", "1");
iStIvtIostorinvOutService.allDiv(out_jo);
} else {
jsonMst.put("tableData", dtls);
String iostorinv_id = checkOutBillService.insertDtl(jsonMst);
//调用自动分配
JSONObject out_jo = new JSONObject();
out_jo.put("iostorinv_id", iostorinv_id);
checkOutBillService.allDiv(out_jo);
}
//调用自动分配
JSONObject out_jo = new JSONObject();
out_jo.put("iostorinv_id", iostorinv_id);
checkOutBillService.allDiv(out_jo);
} else {
throw new BadRequestException("推送失败！SAP推送的子卷明细不符合出库状态！");
}