I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jenkins自动合并

Browse Source
yun-zuoyi
jenkins 6 years ago
parent 5dd94058cf c8f23ba640
commit 33f3fd0963
10 changed files with 59 additions and 71 deletions
Show Stats Download Patch File Download Diff File

23
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java
Unescape Escape View File

@ -27,9 +27,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROCESS_BOM")
@Table(name = "MES_STATION_BOM")
@Api("工序物料清单")
public class MesProcessBom extends BaseBean {
public class MesStationBom extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@ -46,14 +46,6 @@ public class MesProcessBom extends BaseBean {
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@ -67,10 +59,6 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "子零件数量", example = "0")
private Double qty;
@Transient
@ApiParam(value = "绑定数量")
private Double boundQty;
@Column(name = "IS_REPEAT")
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@ -83,11 +71,15 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否投料配置")
private Integer isFeed;
@Column(name = "is_BIND_KEY")
@Column(name = "IS_BIND_KEY")
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Transient
@ApiParam(value = "绑定数量")
private Double boundQty;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;
@ -131,7 +123,6 @@ public class MesProcessBom extends BaseBean {
public String toString() {
return "MesProcessBom{" +
"partNo='" + partNo + '\'' +
", processCode='" + processCode + '\'' +
", itemPartNo='" + itemPartNo + '\'' +
", qty=" + qty +
", isRepeat=" + isRepeat +

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
@ -16,8 +16,8 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("工序BOM model")
public class ProcessBomModel extends MesProcessBom {
@Api("工位BOM model")
public class StationBomModel extends MesStationBom {
@ApiParam("上料数量")
private Long cellFeedQty;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom;
import org.springframework.stereotype.Repository;
/**
@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesProcessBomRepository extends BaseRepository<MesProcessBom, Long> {
public interface MesStationBomRepository extends BaseRepository<MesStationBom, Long> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -98,17 +98,17 @@ public class MesHqlPack {
/**
* 获取原材料扫描信息的对应工序BOM
*
* @param mesProcessBom
* @param mesRawPartSn
* @param stationBom
* @param rawPartSn
* @return
*/
public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) {
DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
return packBean;
}

23
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
Unescape Escape View File

@ -9,13 +9,11 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
* @Description :工序物料清单
@ -29,9 +27,9 @@ import java.util.Date;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROCESS_BOM")
@Table(name = "MES_STATION_BOM")
@Api("工序物料清单")
public class MesProcessBom extends BaseBean {
public class MesStationBom extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@ -48,15 +46,6 @@ public class MesProcessBom extends BaseBean {
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@ -70,10 +59,6 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "子零件数量", example = "0")
private Double qty;
@Transient
@ApiParam(value = "绑定数量")
private Double boundQty;
@Column(name = "IS_REPEAT")
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@ -99,6 +84,9 @@ public class MesProcessBom extends BaseBean {
@ApiParam("显示颜色")
private String color;
@Transient
@ApiParam(value = "绑定数量")
private Double boundQty;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
@ -124,7 +112,6 @@ public class MesProcessBom extends BaseBean {
public String toString() {
return "MesProcessBom{" +
"partNo='" + partNo + '\'' +
", processCode='" + processCode + '\'' +
", itemPartNo='" + itemPartNo + '\'' +
", qty=" + qty +
", isRepeat=" + isRepeat +

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProcessBom;
import cn.estsh.i3plus.pojo.mes.bean.MesStationBom;
import org.springframework.stereotype.Repository;
/**
@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesProcessBomRepository extends BaseRepository<MesProcessBom, Long> {
public interface MesStationBomRepository extends BaseRepository<MesStationBom, Long> {
}

40
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -746,25 +746,24 @@ public class MesHqlPack {
/**
* MES工序BOM信息查询条件封装
*
* @param processBom
* @param stationBom
* @return
*/
public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
public static DdlPackBean getStationBom(MesStationBom stationBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode);
DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean);
return packBean;
}
public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) {
public static DdlPackBean getStationBomExcludeById(MesStationBom stationBom, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean);
DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumEqualPack(stationBom.getIsFeed(), "isFeed", packBean);
DdlPreparedPack.getNumNOEqualPack(stationBom.getId(), "id", packBean);
return packBean;
}
@ -1621,6 +1620,7 @@ public class MesHqlPack {
/**
* 对象结构
*
* @param mesObjectCfg
* @param organizeCode
* @return
@ -1644,6 +1644,7 @@ public class MesHqlPack {
/**
* 数据对象
*
* @param mesDataObject
* @param organizeCode
* @return
@ -1667,6 +1668,7 @@ public class MesHqlPack {
/**
* 产品包装关系
*
* @param mesProdPack
* @param organizeCode
* @return
@ -1693,6 +1695,7 @@ public class MesHqlPack {
/**
* 产品编码配置
*
* @param mesProductEncodeCfg
* @param organizeCode
* @return
@ -1716,6 +1719,7 @@ public class MesHqlPack {
/**
* 客户订单
*
* @param mesCustOrder
* @param organizeCode
* @return
@ -1756,6 +1760,7 @@ public class MesHqlPack {
/**
* 模板配置
*
* @param mesLabelTemplate
* @param organizeCode
* @return
@ -1773,6 +1778,7 @@ public class MesHqlPack {
/**
* 关键动作
*
* @param mesKeyAction
* @param organizeCode
* @return
@ -1796,6 +1802,7 @@ public class MesHqlPack {
/**
* 动作接口配置
*
* @param mesActionIf
* @param organizeCode
* @return
@ -1813,6 +1820,7 @@ public class MesHqlPack {
/**
* 接口清单
*
* @param mesIf
* @param organizeCode
* @return
@ -1836,6 +1844,7 @@ public class MesHqlPack {
/**
* 过程条码报表
*
* @param mesProduceSn
* @param organizeCode
* @return
@ -1872,6 +1881,7 @@ public class MesHqlPack {
/**
* 物料追溯
*
* @param mesProdBindRecord
* @param organizeCode
* @return
@ -1914,6 +1924,7 @@ public class MesHqlPack {
/**
* 物料追溯
*
* @param ifPackageDetail
* @param organizeCode
* @return
@ -1935,6 +1946,7 @@ public class MesHqlPack {
/**
* 维修记录
*
* @param mesRepairRecord
* @param organizeCode
* @return
@ -1971,6 +1983,7 @@ public class MesHqlPack {
/**
* 过程质量检测数据
*
* @param mesQcCheckData
* @param organizeCode
* @return
@ -2001,6 +2014,7 @@ public class MesHqlPack {
/**
* 条码履历报表
*
* @param mesProduceSnTravel
* @param organizeCode
* @return

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class SwebProcurementPlanOrder extends BaseBean {
private String vendorName;
@Column(name = "PART_NO")
@ApiParam(value = "物料名称")
@ApiParam(value = "物料编号")
private String partNo;
@Column(name = "PART_NAME")
@ -53,8 +53,4 @@ public class SwebProcurementPlanOrder extends BaseBean {
@ApiParam(value = "是否寄售")
private Integer consignment=2;
@Column(name = "organize_code")
@ApiParam(value = "组织代码")
private String organizeCode;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
Unescape Escape View File

@ -23,13 +23,13 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TRANS_QUAN", indexes = {
@Table(name = "WMS_TRANS_QUAN"/*, indexes = {
@Index(columnList = "WH_NO"),
@Index(columnList = "ZONE_NO"),
@Index(columnList = "LOCATE_NO"),
@Index(columnList = "REF_SRC"),
@Index(columnList = "ORGANIZE_CODE")
})
}*/)
@Api("库存交易信息")
public class WmsTransQuan extends BaseBean {

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -163,8 +163,8 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);

Write Preview
Loading…
Cancel
Save