Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java

@@ -68,12 +68,6 @@ public class PlateGoodsApply extends BaseEntity {
 	@TableField(value = "PGR_ID")
 	private Long pgrId;
 
-	/**
-	 * 涉及订单要添加的数量
-	 */
-	@TableField(value = "CODE_NUM")
-	private String codeNum;
-
 	/**
 	 * 需求单号
 	 */
@@ -164,10 +158,21 @@ public class PlateGoodsApply extends BaseEntity {
 	@TableField(value = "INVOLVING_RECORD_CODE")
 	private String involvingRecordCode;
 
+	/**
+	 * 本次剩余单号余量
+	 */
+	@TableField(value = "INVOLVING_SURPLUS")
+	private String involvingSurplus;
+
 	/**
 	 * 本次关联订单数量
 	 */
 	@TableField(value = "DETAIL_ORDER_NUM")
 	private Integer detailOrderNum;
 
+	/**
+	 * 涉及订单要添加的数量
+	 */
+	@TableField(value = "CODE_NUM")
+	private String codeNum;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java

@@ -39,5 +39,15 @@ public class PlateGoodsApplyVo extends PlateGoodsApply {
 	 */
 	String createUserName;
 
+	/**
+	 * 审批人
+	 */
+	String approvalManName;
+
+	/**
+	 * 审批结果
+	 */
+	String approvalStatusName;
+
 	List<YieldOrderVo> yieldOrderList;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java

@@ -20,7 +20,6 @@ import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.request.PlateGoodsApplySave;
 import org.springblade.desk.order.pojo.vo.PlateGoodsApplyVo;
 import org.springblade.desk.order.service.IPlateGoodsApplyService;
-import org.springblade.desk.order.service.IPlateGoodsRecordService;
 import org.springblade.desk.order.wrapper.PlateGoodsApplyWrapper;
 import org.springblade.desk.order.wrapper.YieldOrderWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +28,7 @@ import java.util.List;
 
 /**
  * 应用管理控制器 - 镀层物料添加量申报
+ * 参考旧mes：prPlateGoodsApply/queryApply
  *
  * @author lqk
  */
@@ -39,7 +39,6 @@ import java.util.List;
 public class PlateGoodsApplyController extends BladeController {
 
 	private final IPlateGoodsApplyService plateGoodsApplyService;
-	private final IPlateGoodsRecordService plateGoodsRecordService;
 
 	/**
 	 * 分页
@@ -61,12 +60,12 @@ public class PlateGoodsApplyController extends BladeController {
     @GetMapping("/detail")
     @Operation(summary = "详情", description = "")
     public R<PlateGoodsApplyVo> detail(String id) {
-        PlateGoodsApply detail = plateGoodsApplyService.getById(id);
+        PlateGoodsApply apply = plateGoodsApplyService.getById(id);
 
-        PlateGoodsApplyVo vo = PlateGoodsApplyWrapper.build().entityVO(detail);
+		PlateGoodsApplyVo vo = PlateGoodsApplyWrapper.build().entityVO(apply);
 
 		// 查询关联订单列表
-		List<YieldOrder> yieldOrderList = plateGoodsRecordService.listDetailYieldOrder(detail.getId());
+		List<YieldOrder> yieldOrderList = plateGoodsApplyService.listDetailYieldOrder(apply.getId());
 		if(Func.isNotEmpty(yieldOrderList)) {
 			vo.setYieldOrderList(YieldOrderWrapper.build().listVO(yieldOrderList));
 		}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java

@@ -30,6 +30,7 @@ import java.util.List;
 
 /**
  * 应用管理控制器 - 镀层物料需求申报
+ * 参考旧mes：prPlateGoodsRecord/queryRecord
  *
  * @author lqk
  */

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml

@@ -4,8 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsApplyMapper">
     <sql id = "baseCommonFields">
-		ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
+        ID, TENANT_ID, CREATE_USER, CREATE_TIME, CREATE_DEPT, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
-		APPROVAL_STATUS, BO_ID, BR_ID, AC_ID, PGR_ID, CODE_NUM, APPROVAL_MAN, APPROVAL_TIME, APPROVAL_MEMO, DEMAND_CODE
+		APPROVAL_MAN, APPROVAL_TIME, APPROVAL_STATUS, APPROVAL_MEMO, BO_ID, BR_ID, AC_ID, PGR_ID, CODE_NUM,
+		WC_ID, GOODS_CODE, GOODS_DEMAND, SILVER_POTASSIUM, COEFFICIENT, DECLARED_QUOTA, DECLARED_SILVER, DECLARED_STATUS,
+		GOODS_BO_ID, COEFFICIENT_BO_ID, PGR_CODE, SURPLUS, SILVER_POTASSIUM_RESIDUE, DEMAND_CODE, INVOLVING_RECORD_CODE,
+		NOT_ADD_VAL, DETAIL_ORDER_NUM, GOODS_NAME
 	</sql>
 
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsApply">

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java

@@ -33,10 +33,6 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 	private final IAssayContentDetailService assayContentDetailService;
 	private final IPlateGoodsRecordService goodsRecordService;
 
-	private final IPlateGoodsApplyDetailService applyDetailService;
-
-	private final IYieldOrderService yieldOrderService;
-
 	@Override
 	public IPage<PlateGoodsApply> selectPage(IPage<PlateGoodsApply> page, PlateGoodsApply entity) {
 		List<PlateGoodsApply> dataList = baseMapper.selectPage(page, entity);
@@ -54,6 +50,7 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 			item.setApprovalMan(user.getUserId());
 			item.setApprovalTime(DateUtil.now());
 			item.setApprovalStatus(approvalStatus);
+			item.setStatus(approvalStatus);
 			item.setApprovalMemo(approvalMemo);
 			dataList.add(item);
 		});
@@ -115,8 +112,8 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 			apply.setStatus(PlateGoodsEnum.STATUS_WAITING.getCode());
 			apply.setApprovalMan(null);
 			apply.setApprovalStatus(PlateGoodsEnum.STATUS_WAITING.getCode());
-			apply.setApprovalMan(null);
+			apply.setApprovalTime(null);
-			apply.setApprovalMan(null);
+			apply.setApprovalMemo(null);
 
 			if (addVal.compareTo(surplus) >= 0) {
 				// 若本次添加量，满足该订单后，还有剩余， 记录此订单，更新剩余添加量后，继续循环
@@ -152,7 +149,7 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 
 		for (PlateGoodsRecord plateGoodsRecord : addRecordList) {
 			plateGoodsRecord.setInvolvingRecordCode(addAbortRecordNo);
-			plateGoodsRecord.setSurplus(notAddVal);
+			plateGoodsRecord.setDetailOrderNum(addRecordList.size());
 		}
 		goodsRecordService.updateBatchById(addRecordList);
 		saveBatch(applyList);
@@ -161,16 +158,11 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 
 	@Override
 	public List<YieldOrder> listDetailYieldOrder(Long id) {
-		// 先查询关联的明细列表
+		PlateGoodsApply apply = this.getById(id);
-		List<PlateGoodsApplyDetail> detailList = applyDetailService.listByApplyId(id);
+		// 申请明细使用需求的明细，先查询关联的需求
-
+		PlateGoodsRecord record = goodsRecordService.getById(apply.getPgrId());
-		if (Func.isEmpty(detailList)) {
+		// 查询关联订单列表
-			return null;
+		List<YieldOrder> yieldOrderList = goodsRecordService.listDetailYieldOrder(record.getId());
-		}
-
-		List<Long> yieldOrderIds = detailList.stream().map(PlateGoodsApplyDetail::getYoId).collect(Collectors.toList());
-		// 再根据明细中的生产订单id查询订单
-		List<YieldOrder> yieldOrderList = yieldOrderService.listByIds(yieldOrderIds);
 		return yieldOrderList;
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyWrapper.java

@@ -38,6 +38,12 @@ public class PlateGoodsApplyWrapper extends BaseEntityWrapper<PlateGoodsApply, P
 			vo.setCreateUserName(createUser.getAccount());
 		}
 
+		User approvalMan = UserCache.getUser(entity.getApprovalMan());
+		if (Func.isNotEmpty(createUser)) {
+			vo.setApprovalManName(approvalMan.getAccount());
+		}
+
+		vo.setApprovalStatusName(PlateGoodsEnum.getName(entity.getApprovalStatus()));
 		vo.setStatusName(PlateGoodsEnum.getName(entity.getStatus()));
 		return vo;
 	}