仓库管理修改

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClient.java

@@ -6,6 +6,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.vo.StGoodsExtStatusVO;
 import org.springblade.wms.pojo.entity.StRealtimeStock;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -54,7 +55,7 @@ public interface IErpDataWmsClient {
 	 */
 	@PostMapping(CREATE_MOLD_PLAN)
 	R<String> createMoldPlan(@RequestParam(value = "partCode", required = false)String partCode, @RequestParam("moCode")String moCode, @RequestParam("plantype")String plantype, @RequestParam("quantity")Double quantity,
-							 @RequestParam("needDate")Date needDate, @RequestParam("level")String level, @RequestParam("keeper")String keeper, @RequestParam("createMan")String createMan,
+							 @RequestParam("needDate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date needDate, @RequestParam("level")String level, @RequestParam("keeper")String keeper, @RequestParam("createMan")String createMan,
 							 @RequestParam("memo")String memo, @RequestParam("urgentType")String urgentType, @RequestParam("erpWoCode")String erpWoCode) throws BusinessException;
 
 	/**

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataWmsClientFallback.java

@@ -3,6 +3,7 @@ package org.springblade.erpdata.feign;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.vo.StGoodsExtStatusVO;
 import org.springblade.wms.pojo.entity.StRealtimeStock;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,7 +32,7 @@ public class IErpDataWmsClientFallback implements IErpDataWmsClient{
 
 	@Override
 	public R<String> createMoldPlan(@RequestParam(value = "partCode", required = false)String partCode, @RequestParam("moCode")String moCode, @RequestParam("plantype")String plantype, @RequestParam("quantity")Double quantity,
-									@RequestParam("needDate") Date needDate, @RequestParam("level")String level, @RequestParam("keeper")String keeper, @RequestParam("createMan")String createMan,
+									@RequestParam("needDate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date needDate, @RequestParam("level")String level, @RequestParam("keeper")String keeper, @RequestParam("createMan")String createMan,
 									@RequestParam("memo")String memo, @RequestParam("urgentType")String urgentType, @RequestParam("erpWoCode")String erpWoCode) {
 		return R.fail("获取数据失败");
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java

@@ -86,7 +86,7 @@ public class StMoldApplyForController extends BladeController {
 	@Operation(summary = "分页", description = "传入stMoldApplyFor")
 	public R<IPage<StMoldApplyForVO>> page(StMoldApplyForVO stMoldApplyFor, Query query) {
 		stMoldApplyFor.setMafType(StMoldApplyFor.MAF_STATUS_HAVE);
-		stMoldApplyFor.setMafStatus(StMoldApplyFor.MAF_STATUS_NEW);
+//		stMoldApplyFor.setMafStatus(StMoldApplyFor.MAF_STATUS_NEW);
 
 		IPage<StMoldApplyForVO> pages = stMoldApplyForService.selectStMoldApplyForPage(Condition.getPage(query), stMoldApplyFor);
 		return R.data(pages);

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java

@@ -18,6 +18,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.common.feign.IMesNotifyMessageClient;
 import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
+import org.springblade.desk.order.feign.IMoldDemandClient;
 import org.springblade.wms.excel.StRealtimeStockExcel;
 import org.springblade.wms.mapper.*;
 import org.springblade.wms.pojo.entity.*;
@@ -71,6 +72,8 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
 	private StGlassCakeOutMapper stGlassCakeOutMapper;
 	@Resource
 	private IMesNotifyMessageClient mesNotifyMessageClient;
+	@Resource
+	private IMoldDemandClient moldDemandClient;
 
 
 	@Override
@@ -674,7 +677,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
 			notifyMessage.setReceiveUserId(AuthUtil.getUserId());
 			mesNotifyMessageClient.save(notifyMessage);
 			// 执行模具类物料出库补制
-//			generateMoldOutReissueOrder(goodsId, outQuantity);
+			moldDemandClient.saveMoldDemand(stGoods.getGoodsCode());
 
 		} else if ("玻璃饼".equals(goodsCategoryName)) {
 			reissueMsg = String.format("物料编码:%s 名称:%s（类别：%s）触发【物料出库】补制！出库数量:%.2f，开始生成玻璃饼补制单",
@@ -704,7 +707,8 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
 		Long goodsId = stGoods.getId();
 		Double productionBatch = stGoods.getProductionBatch();
 		// 计算当前库存（复用原最低库存预警逻辑）
-		Double currentStock = stGoods.getCurrentQuantity() - outQuantity;
+//		Double currentStock = stGoods.getCurrentQuantity() - outQuantity;
+		Double currentStock = stGoods.getCurrentQuantity();
 		Double minStock = stGoods.getMinNum() == null ? 0.0 : stGoods.getMinNum();
 		String reissueMsg;
 
@@ -730,7 +734,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
 			notifyMessage.setReceiveUserId(AuthUtil.getUserId());
 			mesNotifyMessageClient.save(notifyMessage);
 			// 执行模具类最低库存补制
-//			generateMoldMinStockPurchasePlan(goodsId, currentStock, minStock);
+			moldDemandClient.saveMoldDemand(stGoods.getGoodsCode());
 
 		} else if ("玻璃饼".equals(goodsCategoryName)) {
 			reissueMsg = String.format("物料编码:%s 名称:%s（类别：%s）触发【最低库存】补制！当前库存:%.2f，最低库存:%.2f，开始生成玻璃饼生产订单",