diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a775b40..41042ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable { private String rawSn; @Column(name = "RAW_QTY") - @ApiParam("特殊批次") + @ApiParam("原材料数量") private Double rawQty; @Column(name = "LOT_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java new file mode 100644 index 0000000..809f29c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/3 13:14 + * @desc + */ +@Data +public class CellFeedModel { + + private String workCenterCode; + + private String workCellCode; + + private String color; + + private String partNo; + + private String itemPartNo; + + private String qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3ab2c36..a0d8eaa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -124,6 +124,15 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + return packBean; + } + /** * 生产工单查询条件封装 *