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

Merge branch 'dev' into dev_jinji

Browse Source
This commit is contained in:
王奎兴
2026-07-17 18:06:41 +08:00
parent 5cc987c2c4 5fe5ce7e82
commit a9e3d6cb6b
50 changed files with 1335 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java
+4
View File
@@ -401,4 +401,8 @@ public class InMaterialDetailDTO extends BaseVOEntity {
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
//仓码简易模式收货上架
private BigDecimal collectQuantity;
private String shelfJson;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java
+12
View File
@@ -506,4 +506,16 @@ public class OutMaterialDetailDTO extends BaseVOEntity {
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
//仓码简易模式
@ApiModelProperty("出库重量")
@Excel(name = "出库重量")
private BigDecimal outWeight;
@ApiModelProperty("出库体积")
@Excel(name = "出库体积")
private BigDecimal outVolume;
@ApiModelProperty("出库数量")
@Excel(name = "出库数量")
private BigDecimal outQuantity;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java
+19
View File
@@ -426,4 +426,23 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeTo;
//仓码pda查询参数
@ApiModelProperty("pda查询用户ID")
private Long queryUserId;
@ApiModelProperty("状态列表")
private List<Integer> statusList;
@ApiModelProperty("作业人用户ID")
private Long workUserId;
@ApiModelProperty("作业人用户")
private String workUserName;
@ApiModelProperty("作业任务接收状态")
private String workTaskReceiveStatus;
@ApiModelProperty("任务下发用户ID")
private String taskIssueUserId;
@ApiModelProperty("任务移除用户ID")
private String removeUserId;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+18
View File
@@ -484,4 +484,22 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeTo;
@ApiModelProperty("作业人用户ID")
private Long workUserId;
@ApiModelProperty("作业人用户")
private String workUserName;
@ApiModelProperty("作业任务接收状态")
private String workTaskReceiveStatus;
@ApiModelProperty("任务下发用户ID")
private String taskIssueUserId;
//仓码pda查询参数
@ApiModelProperty("pda查询用户ID")
private Long queryUserId;
@ApiModelProperty("状态列表")
private List<Integer> statusList;
@ApiModelProperty("任务移除用户ID")
private String removeUserId;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
+87
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.interfaces.facadeApi.stockInOrder;
import com.mhd.common.core.web.controller.BaseController;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.common.core.exception.ServiceException;
@@ -8,12 +9,15 @@ import com.mhd.common.core.utils.StringUtils;
import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService;
import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
import com.mhd.wms.interfaces.assember.stockInOrder.StockInOrderAssembler;
import com.mhd.wms.interfaces.assember.stockOutOrder.StockOutOrderAssembler;
import com.mhd.wms.interfaces.dto.inMaterialDetail.InMaterialDetailDTO;
import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
import io.swagger.annotations.ApiOperation;
@@ -22,6 +26,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -172,6 +178,87 @@ public class StockInOrderApi extends BaseController {
stockInOrderApplicationService.omsOrderAdd(stockInOrder);
}
/**
* oms下发单保存
*/
@ApiOperation("pda接收任务")
@PostMapping(value = "/acceptTask")
public AjaxResult acceptTask(@RequestBody StockInOrder stockInOrder) {
stockInOrderApplicationService.acceptTask(stockInOrder);
return AjaxResult.success();
}
/**
* oms下发单保存
*/
@ApiOperation("pda取消接收任务")
@PostMapping(value = "/removeTask")
public AjaxResult removeTask(@RequestBody StockInOrderDO stockInOrderDO) {
stockInOrderApplicationService.removeTask(stockInOrderDO);
return AjaxResult.success();
}
/**
* 审核入库单
*/
@ApiOperation("pda简易模式收货")
@PostMapping(value = "/receiptEasyMode")
public AjaxResult receiptEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) {
StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
List<InMaterialDetailDTO> materialDetailList = stockInOrderDTO.getMaterialDetailList();
if (materialDetailList != null && !materialDetailList.isEmpty()) {
List<InMaterialDetailDO> inMaterialDetailDOList = new ArrayList<>();
for (InMaterialDetailDTO dto : materialDetailList) {
InMaterialDetailDO detailDO = new InMaterialDetailDO();
BeanUtils.copyProperties(dto, detailDO);
inMaterialDetailDOList.add(detailDO);
}
stockInOrderDO.setMaterialDetailList(inMaterialDetailDOList);
}
return AjaxResult.success(stockInOrderApplicationService.receiptEasyMode(stockInOrderDO));
}
@ApiOperation("pda简易模式修改计划数量")
@GetMapping(value = "/updateQuantity")
public AjaxResult updateQuantity(@RequestParam BigDecimal quantity,
@RequestParam Long materialDetailId,
@RequestParam BigDecimal area,
@RequestParam BigDecimal volume
,@RequestParam BigDecimal weight) {
return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId, area, volume, weight));
}
/**
* 审核入库单
*/
@ApiOperation("pda简易模式上架")
@PostMapping(value = "/shelfEasyMode")
public AjaxResult shelfEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) {
StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
List<InMaterialDetailDTO> materialDetailList = stockInOrderDTO.getMaterialDetailList();
if (materialDetailList != null && !materialDetailList.isEmpty()) {
List<InMaterialDetailDO> inMaterialDetailDOList = new ArrayList<>();
for (InMaterialDetailDTO dto : materialDetailList) {
InMaterialDetailDO detailDO = new InMaterialDetailDO();
BeanUtils.copyProperties(dto, detailDO);
inMaterialDetailDOList.add(detailDO);
}
stockInOrderDO.setMaterialDetailList(inMaterialDetailDOList);
}
return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO));
}
/**
* 审核入库单
*/
@ApiOperation("pda简易模式核对上传")
@PostMapping(value = "/checkUploadEasyMode")
public AjaxResult checkUploadEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) {
StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
return AjaxResult.success(stockInOrderApplicationService.checkUploadEasyMode(stockInOrderDO));
}
/**
* oms下发单明细保存
*/
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java
+44
View File
@@ -18,6 +18,7 @@ import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
import com.mhd.wms.domain.stockOutOrder.repository.listener.ExcelParseService;
@@ -346,6 +347,29 @@ public class StockOutOrderApi extends BaseController {
return toAjax(stockOutOrderApplicationService.genPickingOrder(stockOutOrderDO));
}
/**
* 生成拣货单
*/
@ApiOperation("简易模式拣货")
@PostMapping("/adjustPicking")
public AjaxResult adjustPicking(@RequestBody StockOutOrderDTO stockOutOrderDTO) {
StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class);
return toAjax(stockOutOrderApplicationService.adjustPicking(stockOutOrderDO));
}
/**
* 生成拣货单
*/
@ApiOperation("简易核对上传")
@PostMapping("/checkUpload")
public AjaxResult checkUpload(@RequestBody StockOutOrderDTO stockOutOrderDTO) {
StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class);
return toAjax(stockOutOrderApplicationService.checkUpload(stockOutOrderDO));
}
/**
* 生成拣货单
*/
@@ -464,6 +488,26 @@ public class StockOutOrderApi extends BaseController {
stockOutOrderApplicationService.omsOrderAdd(stockOutOrder);
}
/**
* oms下发单保存
*/
@ApiOperation("pda接收任务")
@PostMapping(value = "/acceptTask")
public AjaxResult acceptTask(@RequestBody StockOutOrder stockOutOrder) {
stockOutOrderApplicationService.acceptTask(stockOutOrder);
return AjaxResult.success();
}
/**
* oms下发单保存
*/
@ApiOperation("pda取消接收任务")
@PostMapping(value = "/removeTask")
public AjaxResult removeTask(@RequestBody StockOutOrderDO stockOutOrderDO) {
stockOutOrderApplicationService.removeTask(stockOutOrderDO);
return AjaxResult.success();
}
/**
* oms下发单明细保存
*/