镀层物料

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

@@ -44,6 +44,16 @@ public class PlateGoodsRecordVo extends PlateGoodsRecord {
 	 */
 	String plateGoodsName;
 
+	/**
+	 * 一级审批人
+	 */
+	String approvalManName;
+
+	/**
+	 * 二级审批人
+	 */
+	String approvalManName2;
+
 
 	List<YieldOrderVo> yieldOrderList;
 }

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

@@ -46,4 +46,7 @@ public class YieldOrderVo extends YieldOrder {
 	@Schema(description = "状态值")
 	private String statusTitle;
 
+
+	private String username;
+
 }

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

@@ -108,7 +108,8 @@ public class AssayContentController extends BladeController {
 	 */
 	@GetMapping("/detailListNoUsed")
 	@Operation(summary = "未使用的化验含量明细列表", description = "")
-	public R<List<AssayContentDetail>> detailListNoUsed(@Parameter(description = "作业中心id", required = true) Long workCenterId) {
+	public R<List<AssayContentDetail>> detailListNoUsed(
+			@Parameter(description = "作业中心id", required = true) Long workCenterId) {
 		List<AssayContentDetail> detailList = assayContentService.detailListNoUsed(workCenterId);
 		return R.data(detailList);
 	}

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

@@ -8,7 +8,7 @@
 		ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
 		WC_ID, GOODS_CODE, GOODS_DEMAND, SILVER_POTASSIUM, COEFFICIENT, APPROVAL_MAN, APPROVAL_TIME,
 		APPROVAL_STATUS, APPROVAL_MEMO, DECLARED_QUOTA, DECLARED_SILVER, DECLARED_STATUS, GOODS_BO_ID,
-		COEFFICIENT_BO_ID, PGR_CODE, SURPLUS, SILVER_POTASSIUM_RESIDUE, DEMAND_CODE, INVOLVING_RECORD_CODE
+		COEFFICIENT_BO_ID, PGR_CODE, SURPLUS, SILVER_POTASSIUM_RESIDUE, DEMAND_CODE, INVOLVING_RECORD_CODE,GOODS_NAME
 	</sql>
 
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsRecord">

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

@@ -71,6 +71,9 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 		if (Func.isEmpty(assayContentDetailList)) {
 			return false;
 		}
+		if(apply == null ){
+			apply = new PlateGoodsApply();
+		}
 
 		apply.setApplyCode(generateCode());
 		// 初始化物料需求申报的部分数据

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

@@ -37,6 +37,7 @@ import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
+import org.springblade.desk.order.pojo.vo.YieldOrderVo;
 import org.springblade.desk.order.pojo.vo.oldmes.PrWorkOrder;
 import org.springblade.desk.order.pojo.vo.oldmes.PrWorkPlan;
 import org.springblade.desk.order.service.IPlateGoodsRecordDetailService;
@@ -94,7 +95,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 
 	@Override
 	public List<PlateGoodsRecord> listNoFinished(Long wcId, Integer dayRange) {
-		List<PlateGoodsRecord> dataList = baseMapper.listNoFinished(wcId, dayRange, PlateGoodsEnum.STATUS_PASS.getCode());
+		List<PlateGoodsRecord> dataList = baseMapper.listNoFinished(wcId, dayRange, PlateGoodsEnum.SECOND_STATUS_PASS.getCode());
 		return dataList;
 	}
 
@@ -152,7 +153,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 		// 先查询关联的明细列表
 		List<PlateGoodsRecordDetail> detailList = detailService.listByRecordId(id);
 
-		if (Func.isEmpty(detailList)) {
+		if (CollectionUtils.isEmpty(detailList)) {
 			return null;
 		}
 

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

@@ -1,6 +1,7 @@
 package org.springblade.desk.order.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.cache.WorkCenterCache;
@@ -9,7 +10,10 @@ import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
 import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.desk.order.pojo.vo.PlateGoodsRecordVo;
 import org.springblade.system.cache.UserCache;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.entity.UserInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Objects;
 
@@ -19,6 +23,8 @@ import java.util.Objects;
  * @author Chill
  */
 public class PlateGoodsRecordWrapper extends BaseEntityWrapper<PlateGoodsRecord, PlateGoodsRecordVo> {
+	@Autowired
+	IUserClient userClient;
 
 	public static PlateGoodsRecordWrapper build() {
 		return new PlateGoodsRecordWrapper();
@@ -39,6 +45,23 @@ public class PlateGoodsRecordWrapper extends BaseEntityWrapper<PlateGoodsRecord,
 		}
 
 		vo.setStatusName(PlateGoodsEnum.getName(entity.getStatus()));
+
+		//一级审批人
+		if(entity.getApprovalMan() != null){
+			User approvalMan = UserCache.getUser(entity.getApprovalMan());
+			if (Func.isNotEmpty(approvalMan)) {
+				vo.setApprovalManName(approvalMan.getAccount());
+			}
+		}
+
+		//二级审批人
+		if(entity.getApprovalMan2() != null){
+			User approvalMan2 = UserCache.getUser(entity.getApprovalMan2());
+			if (Func.isNotEmpty(approvalMan2)) {
+				vo.setApprovalManName2(approvalMan2.getAccount());
+			}
+		}
+
 		return vo;
 	}
 }