weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(oms):出库预约落库回填仓库/组织/货主，状态默认已创建

Browse Source 
与入库侧同款修复:insert按仓库档案回填组织/一级组织/仓库编码名称(兜底2841)，委托方回填shipperId/customerId，status默认1已创建(配合App订单状态只读)；补fastjson import
This commit is contained in:
rcx
2026-08-18 18:09:41 +08:00
parent 8692b38671
commit f50a3e690a
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+35 -3
View File
@@ -42,6 +42,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -178,9 +180,39 @@ public class ReserveStockOutOrderDomainService {
stockOutOrderDO.setCheckTaskDistribution(2);
}
LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
if (stockOutOrderDO.getWarehouseId() != null) {
AjaxResult wr = systemServiceFeign.getWarehouseInfoByWarehouseId(stockOutOrderDO.getWarehouseId());
if ("200".equals(String.valueOf(wr.get("code")))) {
WarehouseFeignPO wh = JSON.parseObject(JSONObject.toJSONString(wr.get("data")), WarehouseFeignPO.class);
if (stockOutOrderDO.getOrganizationId() == null && wh.getOrganizationId() != null) {
stockOutOrderDO.setOrganizationId(wh.getOrganizationId());
stockOutOrderDO.setOrganizationName(wh.getOrganizationName());
}
if (wh.getTopOrganizationId() != null) {
stockOutOrderDO.setTopOrganizationId(wh.getTopOrganizationId());
}
if (StringUtils.isBlank(stockOutOrderDO.getWarehouseCode())) {
stockOutOrderDO.setWarehouseCode(wh.getWarehouseCode());
stockOutOrderDO.setWarehouseName(wh.getWarehouseName());
}
}
}
if (stockOutOrderDO.getTopOrganizationId() == null) {
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
}
if (stockOutOrderDO.getOrganizationId() == null) {
stockOutOrderDO.setOrganizationId(2841L);
stockOutOrderDO.setOrganizationName("仓码");
}
if (stockOutOrderDO.getShipperId() == null && loginUser.getUserShipperPo() != null) {
stockOutOrderDO.setShipperId(loginUser.getUserPo().getUserId());
stockOutOrderDO.setShipperName(loginUser.getUserPo().getUserName());
stockOutOrderDO.setCustomerId(loginUser.getUserPo().getUserId());
stockOutOrderDO.setCustomerName(loginUser.getUserPo().getUserName());
}
if (stockOutOrderDO.getStatus() == null) {
stockOutOrderDO.setStatus(1);
}
stockOutOrderService.insert(stockOutOrderDO);
return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
}