仓库管理修改

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

@@ -313,6 +313,10 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 //			dto.setReqdept(AuthUtil.getUser().getDeptId().toString()); // 当前人部门"3400"
 			dto.setReqdept("3400"); // 当前人部门"3400"
 			dto.setReqdat(bo.getNeedDate() == null ? "" : DateUtil.format(bo.getNeedDate(), "yyyy-MM-dd"));
+			Double ratio = goods.getConversionRatio();
+			if (ratio != null && ratio != 0) {
+				dto.setReqqty(BigDecimal.valueOf(Optional.ofNullable(bo.getBuyQty() * ratio).orElse(0D)));
+			}
 			dto.setReqqty(BigDecimal.valueOf(Optional.ofNullable(bo.getBuyQty()).orElse(0D)));
 			dto.setReqdate(bo.getDeclareDate() == null ? "" : DateUtil.format(bo.getDeclareDate(), "yyyy-MM-dd"));
 			dto.setPlnarea(bo.getPlanArea());

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

@@ -200,12 +200,20 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
 		/* 发送 ERP（原逻辑） */
 		if (status == StWmsRequest.APPROVAL_STATUS_CHECKED) {
 			StBuyOrder stBuyOrder = stBuyOrderService.getById(request.getBoId());
+
+			Double reqQty = request.getRequestQty();
+			StGoods goods = stGoodsMapper.selectById(stBuyOrder.getGoodsId());
+			Double ratio = goods.getConversionRatio();
+			if (reqQty != null && ratio != null && ratio != 0) {
+				reqQty = reqQty * ratio;
+			}
+
 			R<User> ruser = userClient.userInfoById(request.getCreateUser());
 			User user = ruser.getData();
 			try {
 				erpDataWmsClient.sendErpBuyRequest(
 					stBuyOrder.getExtraBill(),
-					request.getRequestQty(),
+					reqQty,
 					user.getAccount());
 			} catch (BusinessException e) {
 				throw new RuntimeException("仓库提请发送ERP失败：" + e.getMessage());
@@ -230,13 +238,21 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
 		StBuyOrder stBuyOrder = stBuyOrderService.getById(stWmsRequest.getBoId());
 		StGoods goods = stGoodsMapper.selectById(stBuyOrder.getGoodsId());
 		StWmsRequest oldRequest = this.getById(stWmsRequest);
+
+		Double oldQty = oldRequest.getRequestQty();
+		Double newQty = stWmsRequest.getRequestQty();
+		Double ratio = goods.getConversionRatio();
+		if (ratio != null && ratio != 0) {
+			oldQty = oldQty * ratio;
+			newQty = newQty * ratio;
+		}
 		try {
 			erpDataWmsClient.createOrReplace(
 				stBuyOrder.getExtraBill(),
 				goods.getGoodsCode(),
 				"0",
-				oldRequest.getRequestQty(),
+				oldQty,
-				stWmsRequest.getRequestQty());
+				newQty);
 		} catch (BusinessException e) {
 			throw new RuntimeException("仓库提请修改ERP失败：" + e.getMessage());
 		}
@@ -258,13 +274,19 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
 				StWmsRequest stWmsRequest = this.getById(id);
 				StBuyOrder stBuyOrder = stBuyOrderService.getById(stWmsRequest.getBoId());
 				StGoods goods = stGoodsMapper.selectById(stBuyOrder.getGoodsId());
+
+				Double reqQty = stWmsRequest.getRequestQty();
+				Double ratio = goods.getConversionRatio();
+				if (reqQty != null && ratio != null && ratio != 0) {
+					reqQty = reqQty * ratio;
+				}
 				if (stWmsRequest == null) continue;
 				try {
 					erpDataWmsClient.createOrReplace(
 						stBuyOrder.getExtraBill(),
 						goods.getGoodsCode(),
 						"1",
-						stWmsRequest.getRequestQty(),
+						reqQty,
 						0.0);
 				} catch (BusinessException e) {
 					throw new RuntimeException("删除模具计划失败：" + e.getMessage());