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 732370305..3386bd723 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 @@ -26,6 +26,8 @@ public interface WmsTaskClient { String BUY_ORDER_APPLY = API_PREFIX + "/buyOrderApply"; + String SAVE_SUB_ORDER_WAREHOUSING = API_PREFIX + "/saveSubOrderWarehousing"; + /** * 物料状态监控同步erp */ @@ -40,4 +42,12 @@ public interface WmsTaskClient { @RequestParam("buyDate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date buyDate, @RequestParam("checkUserId")Long checkUserId, @RequestParam("checkDate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date checkDate) throws Exception; -} + + /** + * 子件入库 + */ + @PostMapping(SAVE_SUB_ORDER_WAREHOUSING) + void saveSubOrderWarehousing(@RequestParam("goodsCode")String goodsCode, @RequestParam("batchNo")String batchNo, @RequestParam("quantity")Double quantity, + @RequestParam("shId")Long shId, @RequestParam("slId")Long slId, @RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date date, + @RequestParam("userId")Long userId) throws Exception; + } 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 01916a448..8466243d1 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 @@ -6,6 +6,7 @@ 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.springblade.wms.service.IStOtherReceiptRecordService; import org.springframework.web.bind.annotation.RestController; import java.util.Date; @@ -29,6 +30,8 @@ public class WmsTaskClientImpl implements WmsTaskClient{ private final IStBuyOrderService stBuyOrderService; + private final IStOtherReceiptRecordService stOtherReceiptRecordService; + @Override public boolean executeGoodsStatusUpdate() { stGoodsExtService.executeGoodsStatusUpdate(); @@ -39,4 +42,9 @@ public class WmsTaskClientImpl implements WmsTaskClient{ 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); } + + @Override + public void saveSubOrderWarehousing(String goodsCode, String batchNo, Double quantity, Long shId, Long slId, Date date, Long userId) throws Exception { + stOtherReceiptRecordService.saveSubOrderWarehousing(goodsCode, batchNo, quantity, shId, slId, date, userId); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java index e1a8a6c85..15abf1792 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java @@ -10,6 +10,7 @@ import org.springblade.wms.pojo.entity.StOtherReceiptRecord; import org.springblade.wms.pojo.entity.StStockInoutRecord; import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO; +import java.util.Date; import java.util.List; /** @@ -45,5 +46,8 @@ public interface IStOtherReceiptRecordService extends BaseService public StGoods saveGoodsInfo(List prtnoList) throws Exception { StGoods goods = null; //查询物料信息 -// List pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); - - List pdmPartInfo = new ArrayList<>(); - - StPdmPartDTO dto1 = new StPdmPartDTO(); - dto1.setPrtno("TEST-MAT-001"); - dto1.setReleaseno("V1.0"); - dto1.setDrwpartno("DWG-TEST-001"); - dto1.setPrtdesc("测试物料_环规"); - dto1.setMtlsgrt(7.85); - dto1.setPrttype("PART"); - dto1.setSource("自制"); - dto1.setMtlspcf("45#钢"); - dto1.setPrtum("PCS"); - dto1.setCavityno("1"); - dto1.setCplb("机械部件"); - dto1.setEcnno("ECN-TEST-001"); - dto1.setEnditem((short) 123); - dto1.setMtltmrk("45#钢"); - dto1.setPartLink("/pdm/part/TEST-MAT-001"); - dto1.setPriority("1"); - dto1.setPrtrevedit("Released"); - dto1.setPrtstd("GB/T 1234-2020"); - dto1.setPrtwt(0.5); - dto1.setRemark("测试物料"); - dto1.setTrademark("测试"); - dto1.setRcdchgdatd(new Date()); - - pdmPartInfo.add(dto1); + List pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); log.debug("pdmPartInfo：{}", pdmPartInfo); if (CollectionUtils.isEmpty(pdmPartInfo)) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java index 324654907..894cc75fc 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java @@ -7,13 +7,16 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; +import org.springblade.common.exception.BusinessException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.dashboard.feign.IPartClient; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.produce.pojo.entity.WorkOrder; +import org.springblade.system.feign.IUserClient; import org.springblade.wms.excel.StOtherReceiptRecordExcel; import org.springblade.wms.mapper.StOtherReceiptRecordMapper; import org.springblade.wms.pojo.dto.InitStockDTO; @@ -52,6 +55,8 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl inoutList = new ArrayList<>(); + StStockInoutRecord stockInoutRecord = new StStockInoutRecord(); + stockInoutRecord.setGoodsId(goods.getId()); + stockInoutRecord.setPiNo(batchNo); + stockInoutRecord.setQuantity(quantity); + stockInoutRecord.setShId(shId); + stockInoutRecord.setSlId(slId); + stockInoutRecord.setInOutDate(date); + stockInoutRecord.setCreateUser(userId); + inoutList.add(stockInoutRecord); + + otherReceiptRecord.setInoutList(inoutList); + + this.otherWarehousing(otherReceiptRecord, user); + } + @Override public List exportStOtherReceiptRecord(Wrapper queryWrapper) { List stOtherReceiptRecordList = baseMapper.exportStOtherReceiptRecord(queryWrapper);