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

oms出入库;

Browse Source
This commit is contained in:
王奎兴
2026-04-17 08:59:16 +08:00
parent ce6d42ce61
commit ddc1f5d2ea
10 changed files with 430 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+10
View File
@@ -14,6 +14,8 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStock
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.system.api.SystemServiceFeign;
import com.mhd.system.api.UserServiceFeign;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.StockInOrder;
import com.mhd.system.api.domain.SysDictData;
import com.mhd.system.api.domain.WarehouseFeignPO;
import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
@@ -300,6 +302,14 @@ public class ReservationStockInOrderApplicationService {
return stockInOrderDomainService.closeOrder(stockInOrderDO);
}
public Boolean pushInOrder(StockInOrder stockInOrderDO){
return stockInOrderDomainService.pushInOrder(stockInOrderDO);
}
public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail){
return stockInOrderDomainService.pushInOrderDetail(inMaterialDetail);
}
/**
* 导入入库单（根据Excel模板：表头在第1-12行，明细表从第13行开始）
* Excel模板结构：
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+16 -1
View File
@@ -376,7 +376,9 @@ public class ReservationStockInOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean auditState(ReservationStockInOrderDO stockInOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Integer auditStatus = stockInOrderDO.getAuditStatus();
Integer issueStatus = 0;
issueStatus = auditStatus == 2 ? 2 : 3;
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
? loginUser.getUserPo().getUserName()
@@ -388,6 +390,7 @@ public class ReservationStockInOrderDomainService {
.set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid())
.set(ReservationStockInOrder::getUpdateByName, userRealName)
.set(ReservationStockInOrder::getUpdateTime, new Date())
.set(ReservationStockInOrder::getAuditStatus, issueStatus)
.in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds()));
}
@@ -511,6 +514,18 @@ public class ReservationStockInOrderDomainService {
.in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds()));
}
public Boolean pushInOrder(StockInOrder stockInOrder) {
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
BeanUtils.copyProperties(stockInOrder, reservationStockInOrder);
return stockInOrderService.save(reservationStockInOrder);
}
public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail) {
ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail();
BeanUtils.copyProperties(inMaterialDetail, reservationInMaterialDetail);
return materialDetailService.save(reservationInMaterialDetail);
}
/**
* @description 审核通过生成收货单
* @author ZhouGY
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+16 -13
View File
@@ -210,7 +210,7 @@ public class ReservationStockOutOrderApplicationService {
//设置货主信息
shipperParam(stockOutOrderDO);
//设置客户信息
customerParam(stockOutOrderDO);
//customerParam(stockOutOrderDO);
stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
stockOutOrderDO.setOrderTypeName("普通出库");
//设置数据字典键值
@@ -232,6 +232,15 @@ public class ReservationStockOutOrderApplicationService {
return stockOutOrderDomainService.close(stockOutOrderDO);
}
public Boolean pushOutOrder(StockOutOrder stockOutOrderDO){
return stockOutOrderDomainService.pushOutOrder(stockOutOrderDO);
}
public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail){
return stockOutOrderDomainService.pushOutOrderDetail(outMaterialDetail);
}
/**
* 批量删除出库单
*/
@@ -826,18 +835,9 @@ public class ReservationStockOutOrderApplicationService {
* @param stockOutOrderDO
*/
private void shipperParam(ReservationStockOutOrderDO stockOutOrderDO){
String customerName = stockOutOrderDO.getCustomerName();
if (customerName == null || !customerName.matches("\\d+")) {
AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName);
if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
throw new ServiceException("获取客户信息失败");
}
UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
stockOutOrderDO.setShipperId(userPo.getUserId());
stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
stockOutOrderDO.setShipperName(userPo.getUserName());
} else {
AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(customerName));
Long shipperId = stockOutOrderDO.getShipperId();
if (shipperId != null ) {
AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(shipperId));
if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
throw new ServiceException("获取货主信息失败");
}
@@ -845,6 +845,9 @@ public class ReservationStockOutOrderApplicationService {
stockOutOrderDO.setShipperId(userPo.getUserId());
stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
stockOutOrderDO.setShipperName(userPo.getUserName());
stockOutOrderDO.setCustomerId(userPo.getUserId());
stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
stockOutOrderDO.setCustomerName(userPo.getUserName());
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+17 -2
View File
@@ -201,6 +201,19 @@ public class ReservationStockOutOrderDomainService {
}
public Boolean pushOutOrder(StockOutOrder stockOutOrder) {
ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder();
BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder);
return stockOutOrderService.save(reservationStockOutOrder);
}
public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail) {
ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail();
BeanUtils.copyProperties(outMaterialDetail, reservationOutMaterialDetail);
return outMaterialDetailService.save(reservationOutMaterialDetail);
}
/**
* @description 审核出库单
* @author ZhouGY
@@ -211,7 +224,9 @@ public class ReservationStockOutOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean auditState(ReservationStockOutOrderDO stockOutOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Integer auditStatus = stockOutOrderDO.getAuditStatus();
Integer issueStatus = 0;
issueStatus = auditStatus == 2 ? 2 : 3;
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
? loginUser.getUserPo().getUserName()
@@ -223,6 +238,7 @@ public class ReservationStockOutOrderDomainService {
.set(ReservationStockOutOrder::getUpdateBy, loginUser.getUserid())
.set(ReservationStockOutOrder::getUpdateByName, userRealName)
.set(ReservationStockOutOrder::getUpdateTime, new Date())
.set(ReservationStockOutOrder::getIssueStatus, issueStatus)
.in(ReservationStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds()));
}
@@ -236,7 +252,6 @@ public class ReservationStockOutOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean issueOrder(ReservationStockOutOrderDO stockOutOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
? loginUser.getUserPo().getUserName()
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java
+17
View File
@@ -13,6 +13,10 @@ import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationSt
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDTO;
import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderApplicationService;
import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderAssembler;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.OutMaterialDetail;
import com.mhd.system.api.domain.StockInOrder;
import com.mhd.system.api.domain.StockOutOrder;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -176,4 +180,17 @@ public class ReservationStockOutOrderApi extends BaseController {
return toAjax(stockOutOrderApplicationService.close(stockOutOrderDO));
}
@ApiOperation("wms推送入库单")
@PostMapping(value = "/pushOutOrder")
public AjaxResult pushOutOrder(@RequestBody StockOutOrder stockOutOrder) {
return AjaxResult.success(stockOutOrderApplicationService.pushOutOrder(stockOutOrder));
}
@ApiOperation("wms推送入库单明细")
@PostMapping(value = "/pushOutOrderDetail")
public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetail outMaterialDetail) {
return AjaxResult.success(stockOutOrderApplicationService.pushOutOrderDetail(outMaterialDetail));
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
+14
View File
@@ -8,6 +8,8 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationSto
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderApplicationService;
import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderAssembler;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.StockInOrder;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -148,4 +150,16 @@ public class ReservationStockInOrderApi extends BaseController {
return AjaxResult.success(stockInOrderApplicationService.closeOrder(stockInOrderDO));
}
@ApiOperation("wms推送入库单")
@PostMapping(value = "/pushInOrder")
public AjaxResult pushInOrder(@RequestBody StockInOrder stockInOrder) {
return AjaxResult.success(stockInOrderApplicationService.pushInOrder(stockInOrder));
}
@ApiOperation("wms推送入库单明细")
@PostMapping(value = "/pushInOrderDetail")
public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetail inMaterialDetail) {
return AjaxResult.success(stockInOrderApplicationService.pushInOrderDetail(inMaterialDetail));
}
}