diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java index e4e3450f..5a17833a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java +++ b/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; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java index 174ec14e..e6bc3617 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java +++ b/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 yieldOrderList; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java index 2cd10b93..74c7c98e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java @@ -27,9 +27,17 @@ public interface PlateGoodsRecordMapper extends BaseMapper { * 查询已审批通过但未添加完成的申请列表 * * @param wcId - * @param dayRange 查询几天内的数据,传0或空为查询全部 + * @param dayRange 查询几天内的数据,传0或空为查询全部 * @param approvalStatus * @return */ List listNoFinished(Long wcId, Integer dayRange, Integer approvalStatus); + + /** + * 查询当前库中的最大编码 + * + * @param codePattern + * @return + */ + String getMaxByCodePattern(String codePattern); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml index c0d695c0..cc96b294 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml @@ -37,4 +37,15 @@ AND CREATE_TIME >= SYSDATE - #{dayRange} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index 182b4807..926d9794 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -111,7 +111,7 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl 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