Merge branch 'master' into develop-QA

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

@@ -39,7 +39,7 @@ public class PlateGoodsRecord extends BaseEntity {
 	private String plateGoodsCode;
 
 	/**
-	 * 物料需求定额
+	 * 物料需求
 	 */
 	@TableField(value = "GOODS_DEMAND")
 	private BigDecimal goodsDemand;
@@ -111,12 +111,6 @@ public class PlateGoodsRecord extends BaseEntity {
 	@TableField(value = "COEFFICIENT_BO_ID")
 	private Long coefficientBoId;
 
-	/**
-	 *
-	 */
-	@TableField(value = "PGR_CODE")
-	private String pgrCode;
-
 	/**
 	 * 剩余量
 	 */
@@ -136,10 +130,8 @@ public class PlateGoodsRecord extends BaseEntity {
 	private String involvingRecordCode;
 
 	/**
-	 * 本次剩余单号余量
+	 * 本次关联订单数量
 	 */
-	@TableField(value = "NOT_ADD_VAL")
-	private BigDecimal notAddVal;
-
-
+	@TableField(value = "DETAIL_ORDER_NUM")
+	private Integer detailOrderNum;
 }

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

@@ -39,5 +39,11 @@ public class PlateGoodsRecordVo extends PlateGoodsRecord {
 	 */
 	String createUserName;
 
+	/**
+	 * 镀层物料
+	 */
+	String plateGoodsName;
+
+
 	List<YieldOrderVo> yieldOrderList;
 }

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

@@ -32,4 +32,12 @@ public interface PlateGoodsRecordMapper extends BaseMapper<PlateGoodsRecord> {
 	 * @return
 	 */
 	List<PlateGoodsRecord> listNoFinished(Long wcId, Integer dayRange, Integer approvalStatus);
+
+	/**
+	 * 查询当前库中的最大编码
+	 *
+	 * @param codePattern
+	 * @return
+	 */
+	String getMaxByCodePattern(String codePattern);
 }

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

@@ -37,4 +37,15 @@
             AND CREATE_TIME >= SYSDATE - #{dayRange}
         </if>
     </select>
+
+    <select id = "getMaxByCodePattern" resultType = "string">
+		SELECT *
+		FROM(
+			SELECT DEMAND_CODE
+			FROM MES_PLATE_GOODS_RECORD
+			WHERE IS_DELETED = 0 AND DEMAND_CODE LIKE CONCAT(#{codePattern}, '%')
+			ORDER BY DEMAND_CODE DESC
+		)
+		WHERE ROWNUM = 1
+    </select>
 </mapper>

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

@@ -111,7 +111,7 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 
 		for (PlateGoodsRecord plateGoodsRecord : addRecordList) {
 			plateGoodsRecord.setInvolvingRecordCode(addAbortRecordNo);
-			plateGoodsRecord.setNotAddVal(notAddVal);
+			plateGoodsRecord.setSurplus(notAddVal);
 		}
 		goodsRecordService.saveBatch(addRecordList);
 		return true;

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

@@ -2,12 +2,12 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
+import org.springblade.common.utils.StringPrefixUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.dashboard.utils.DateUtils;
 import org.springblade.desk.order.mapper.PlateGoodsRecordMapper;
 import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
 import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
@@ -48,11 +48,11 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 
 	@Override
 	public boolean save(PlateGoodsRecord entity, List<PlateGoodsRecordDetail> detailList) {
-		// todo 需求单号需要优化
-		entity.setDemandCode(DateUtils.dateTimeNow());
+		entity.setDemandCode(generateCode());
 		entity.setSurplus(entity.getDeclaredQuota());
 		entity.setStatus(PlateGoodsEnum.STATUS_WAITING.getCode());
 		entity.setApprovalStatus(PlateGoodsEnum.STATUS_WAITING.getCode());
+		entity.setDetailOrderNum(detailList.size());
 		if (this.save(entity)) {
 			for (PlateGoodsRecordDetail detail : detailList) {
 				detail.setPgrdId(entity.getId());
@@ -107,4 +107,24 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 		return yieldOrderList;
 	}
 
+	private String generateCode() {
+		// 自增总长度
+		int len = 3;
+		// 自增值
+		int num = 0;
+
+		// 编码模式
+		String codePattern = DateUtil.today();
+
+		// 当前模式下最大编码
+		String demandCode = baseMapper.getMaxByCodePattern(codePattern);
+		if (demandCode != null) {
+			num = Integer.parseInt(demandCode.substring(codePattern.length(), codePattern.length() + len));
+		}
+		num++;
+
+		// 下个编码
+		return codePattern + StringPrefixUtils.prefix(String.valueOf(num), "0", len);
+	}
+
 }

doc/sql/mes/increase-260120.sql

@@ -34,8 +34,8 @@ ALTER TABLE MES_PLATE_GOODS_RECORD_DETAIL MODIFY PGRD_ID NUMBER(20,0);
 
 ALTER TABLE MES_PLATE_GOODS_RECORD ADD INVOLVING_RECORD_CODE VARCHAR2(255) NULL;
 COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.INVOLVING_RECORD_CODE IS '本次添加涉及单号';
-ALTER TABLE MES_PLATE_GOODS_RECORD ADD NOT_ADD_VAL NUMBER(20,10) NULL;
-COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.NOT_ADD_VAL IS '本次剩余单号余量';
+ALTER TABLE MES_PLATE_GOODS_RECORD ADD DETAIL_ORDER_NUM NUMBER(8,0) NULL;
+COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.DETAIL_ORDER_NUM IS '本次关联订单数量';
 
 ALTER TABLE MES_ASSAY_CONTENT_DETAIL ADD ADD_VAL NUMBER(20,10) NULL;
 COMMENT ON COLUMN MES_ASSAY_CONTENT_DETAIL.ADD_VAL IS '添加量值';