diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java index 258799e..670a61f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java @@ -77,6 +77,7 @@ public class WmsPurchaseOrderController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@RequestBody WmsPurchaseOrderBo bo) { + bo.setPoType("1");//订单类型(1人工创建,2ERP同步,3后台创建4) return R.ok(wmsPurchaseOrderService.insertByBo(bo)); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/dubbo/RemoteInventoryCheckServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/dubbo/RemoteInventoryCheckServiceImpl.java index 29186b2..1bc3bb4 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/dubbo/RemoteInventoryCheckServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/dubbo/RemoteInventoryCheckServiceImpl.java @@ -77,7 +77,7 @@ public class RemoteInventoryCheckServiceImpl implements RemoteInventoryCheckServ checkBo.setCheckType(task.getWmsCheckTaskType()); checkBo.setCheckStatus("0"); // 盘点状态(0计划,2盘点中,3盘点完成) // checkBo.setBeginTime(new Date());// 盘点开始时间 - checkBo.setCheckCode(generateOrderCode());// 私有方法根据规则生成盘点单号 + checkBo.setCheckCode(generateOrderCode(task));// 私有方法根据规则生成盘点单号 wmsInventoryCheckService.insertByBo(checkBo); String checkCode = checkBo.getCheckCode(); // 已生成 @@ -141,14 +141,17 @@ public class RemoteInventoryCheckServiceImpl implements RemoteInventoryCheckServ * * @return String 订单编码字符串,格式如:ST + yyMMddHHssmm + 4位序列号 */ - private String generateOrderCode(){ + private String generateOrderCode(WmsCheckTaskVo task){ // 获取当前时间并格式化为订单日期部分 Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm"); String orderDate = format.format(date).substring(2); // 初始化订单前缀和后缀变量 - String order = "ST"; + String order = "PD"; + if (task.getWmsCheckTaskType().equals("0")){ + order = "CJ"; + } String orderLast=""; // 获取下一个序列值并根据长度判断是否需要重置序列 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java index 8c41cd5..b6d122c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPurchaseOrderDetailService.java @@ -1,10 +1,9 @@ package org.dromara.wms.service; -import org.dromara.wms.domain.WmsPurchaseOrderDetail; -import org.dromara.wms.domain.vo.WmsPurchaseOrderDetailVo; -import org.dromara.wms.domain.bo.WmsPurchaseOrderDetailBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.wms.domain.bo.WmsPurchaseOrderDetailBo; +import org.dromara.wms.domain.vo.WmsPurchaseOrderDetailVo; import java.util.Collection; import java.util.List; @@ -68,4 +67,14 @@ public interface IWmsPurchaseOrderDetailService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); int deleteByPos(Collection pos, Boolean isValid); + + /** + * 查询采购订单-物料列表(带已入库数量统计) + * + * @param bo 查询条件 + * @return 采购订单-物料列表 + */ + List queryListWithInstockedQty(WmsPurchaseOrderDetailBo bo); + + }