Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-06-28 14:35:02 +08:00
parent 6aff54a3a5 9d3682a3f9
commit 68427b0108
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java
+3
View File
@@ -52,6 +52,9 @@ public class PlanSaveReqVO {
@Schema(description = "生产单id与商品id 列表",requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "生产单id与商品id 列表",requiredMode = Schema.RequiredMode.REQUIRED)
private List<Item> itemList; private List<Item> itemList;
@Schema(description = "商品数量")
private Long goodsNum;
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class PlatePage {
@Schema(description = "生产单id") @Schema(description = "生产单id")
private Long orderId; private Long orderId;
@Schema(description = "商品id") @Schema(description = "商品id")
private String goodsId; private Long goodsId;
@Schema(description = "板名称") @Schema(description = "板名称")
private String name; private String name;
@Schema(description = "商品名称") @Schema(description = "商品名称")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+2 -1
View File
@@ -336,6 +336,7 @@
select distinct b.id as orderId, select distinct b.id as orderId,
c.id as goodsId,
c.width, c.width,
c.height, c.height,
c.thickness, c.thickness,
@@ -359,7 +360,7 @@
#{orderIds} #{orderIds}
</foreach> </foreach>
group by b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color; group by c.id,b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
+6 -5
View File
@@ -20,20 +20,21 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) { default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<RemainPlateDO>() return selectPage(reqVO, new LambdaQueryWrapperX<RemainPlateDO>()
.eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId()) .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null)
.eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null)
.eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId()) .eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId())
.eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
.eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
.eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting()) .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting())
.likeIfPresent(RemainPlateDO::getName, reqVO.getName()) .likeIfPresent(RemainPlateDO::getName, reqVO.getName())
.eqIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial()) .likeIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial())
.eqIfPresent(RemainPlateDO::getColor, reqVO.getColor()) .likeIfPresent(RemainPlateDO::getColor, reqVO.getColor())
.eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness()) .eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness())
.eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand()) .eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand())
.eqIfPresent(RemainPlateDO::getPlaceStyle, reqVO.getPlaceStyle()) .eqIfPresent(RemainPlateDO::getPlaceStyle, reqVO.getPlaceStyle())
.eqIfPresent(RemainPlateDO::getStore, reqVO.getStore()) .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore())
.eqIfPresent(RemainPlateDO::getCount, reqVO.getCount()) .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount())
.eqIfPresent(RemainPlateDO::getRemark, reqVO.getRemark()) .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark())
.eqIfPresent(RemainPlateDO::getUseType, reqVO.getUseType()) .eqIfPresent(RemainPlateDO::getUseType, reqVO.getUseType())
.eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId()) .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId())
.eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson()) .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson())