diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java index 632ec574..ff453c1e 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java @@ -2,6 +2,9 @@ package org.springblade.wms.feign; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Date; /** * @version 1.0 @@ -20,10 +23,19 @@ public interface WmsTaskClient { String EXECUTE_GOODS_STATUS_UPDATE = API_PREFIX + "/executeGoodsStatusUpdate"; + String BUY_ORDER_APPLY = API_PREFIX + "/buyOrderApply"; + /** * 物料状态监控同步erp */ @PostMapping(EXECUTE_GOODS_STATUS_UPDATE) boolean executeGoodsStatusUpdate(); + /** + * 额外计划提请 + */ + @PostMapping(BUY_ORDER_APPLY) + Long buyOrderApply(@RequestParam("goodsCode")String goodsCode, @RequestParam("buyQty")Double buyQty, @RequestParam("userId")Long userId, + @RequestParam("buyDate")Date buyDate, @RequestParam("checkUserId")Long checkUserId, @RequestParam("checkDate")Date checkDate) throws Exception; + } diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java index f5e83788..0e9b56d6 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java @@ -179,6 +179,10 @@ public class StBuyOrder extends TenantEntity { * 已提交 */ public static Short BOSTATUS_SUBMIT = 3; + /** + * 采购员已审批 + */ + public static Short BOSTATUS_BUY_APPROVED = 4; /** * 采购中 */ diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java index 9d4b2e91..f51e7660 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java @@ -1,6 +1,7 @@ package org.springblade.wms.pojo.vo; import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.wms.pojo.entity.StGoods; @@ -25,4 +26,8 @@ public class StGoodsVO extends StGoods { @TableField(exist = false) private Double avlQuantity; + @TableField(exist = false) + @Schema(description = "库房ID(关联st_storehouse表)") + private Long shId; + } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java index a5596d9a..01916a44 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java @@ -4,9 +4,12 @@ import io.swagger.v3.oas.annotations.Hidden; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.wms.service.IStBuyOrderService; import org.springblade.wms.service.IStGoodsExtService; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; + /** * @version 1.0 * @program: jonhon-mes-svr @@ -24,9 +27,16 @@ public class WmsTaskClientImpl implements WmsTaskClient{ private final IStGoodsExtService stGoodsExtService; + private final IStBuyOrderService stBuyOrderService; + @Override public boolean executeGoodsStatusUpdate() { stGoodsExtService.executeGoodsStatusUpdate(); return true; } + + @Override + public Long buyOrderApply(String goodsCode, Double buyQty, Long userId, Date buyDate, Long checkUserId, Date checkDate) throws Exception { + return stBuyOrderService.buyOrderApplyFor(goodsCode, buyQty, userId, buyDate, checkUserId, checkDate); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java index f232afda..895c259e 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java @@ -43,5 +43,7 @@ public interface StGoodsMapper extends BaseMapper { StGoods queryByCodeAndVersion(@Param("prtno") String prtno, @Param("releaseNo") String releaseNo); List selectFindAllGoodsPage(IPage page, StGoodsVO stGoods); + + List queryByShId(IPage page, StGoodsVO stGoods); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml index bf9c68b5..d119ea1c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml @@ -106,4 +106,23 @@ WHERE ROWNUM = 1 + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java index 18c76057..7bff6925 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java @@ -9,6 +9,7 @@ import org.springblade.wms.pojo.dto.StBuyOrderDTO; import org.springblade.wms.pojo.entity.StBuyOrder; import org.springblade.wms.pojo.vo.StBuyOrderVO; +import java.util.Date; import java.util.List; /** @@ -57,6 +58,8 @@ public interface IStBuyOrderService extends BaseService { void approvalOrder(Long id, Short approvalResult, BladeUser approver); + Long buyOrderApplyFor(String goodsCode, Double buyQty, Long userId, Date buyDate, Long checkUserId, Date checkDate) throws Exception; + // JSONObject otherPlanDetail(Long id, String prtno); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java index d89002be..0330893c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java @@ -51,5 +51,7 @@ public interface IStGoodsService extends BaseService { IPage selectFindAllGoodsPage(IPage page, StGoodsVO stGoods); void addLockQuantity(Long goodsId, double v); + + IPage queryByShId(IPage page, StGoodsVO stGoods); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index b4c370ec..37e6f5a9 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -312,6 +312,41 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + list.add(bo); + this.purOtherRest(list, userId); + + return bo.getId(); + } + public StBuyOrder getByExtraBill(String extraBill) { return baseMapper.getByExtraBill(extraBill); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java index 83db51c2..3295fc2c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java @@ -214,5 +214,9 @@ public class StGoodsServiceImpl extends BaseServiceImpl return stGoodsList; } + @Override + public IPage queryByShId(IPage page, StGoodsVO stGoods) { + return page.setRecords(baseMapper.queryByShId(page, stGoods)); + } }