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

BH-CODE 出库，绑定

Browse Source
yun-zuoyi
qianhs 5 years ago
parent 33c0ab4015
commit 17b27da539
10 changed files with 53 additions and 108 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -300,6 +300,16 @@ public class DdlPreparedPack {
}
/**
* 判断字段为空
*
* @param columnName 列名
* @param packBean
*/
public static void getStringNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null, " and ( model." + columnName +
" is null or model." + columnName + " ='')", null);
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名

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

@ -30,6 +30,10 @@ import javax.persistence.Table;
@Api("班次信息")
public class WmsSerialSnTrans extends BaseBean {
@Column(name = "BATCH_NO")
@ApiParam("batch号")
private String batchNo;
@Column(name="SERIAL_SN")
@ApiParam("产品条码")
private String serialSn;
@ -58,4 +62,18 @@ public class WmsSerialSnTrans extends BaseBean {
@Column(name="TRANS_TYPE")
@ApiParam("操作类型")
private Integer transType;
public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
this.organizeCode = wmsSerialSn.getOrganizeCode();
this.batchNo = wmsSerialSn.getBatchNo();
this.serialSn = wmsSerialSn.getSerialSn();
this.bhType = wmsSerialSn.getBhType();
this.partNo = wmsSerialSn.getPartNo();
this.partNameRdd = wmsSerialSn.getPartNameRdd();
this.destStockSn = wmsSerialSn.getStockSn();
this.transType = transType;
}
public WmsSerialSnTrans() {
}
}

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

@ -1,82 +0,0 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 产品条码事务表
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-05-23 10:44 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "WMS_SERIAL_TRANS")
@Api("产品条码事务")
public class WmsSerialTrans extends BaseBean {
private static final long serialVersionUID = -5026295121251346312L;
@Column(name = "BATCH_NO")
@ApiParam(value = "父物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String batchNo;
@Column(name = "SERIAL_SN")
@ApiParam(value = "产品条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String serialSn;
@Column(name = "BH_TYPE")
@ApiParam(value = "BH类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_TYPE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_TYPE")
private Integer bhType;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNameRdd;
@Column(name = "SRC_STOCK_SN")
@ApiParam(value = "原库存条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String srcStockSn;
@Column(name = "DEST_STOCK_SN")
@ApiParam(value = "目的库存条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String destStockSn;
@Column(name = "TRANS_TYPE")
@ApiParam(value = "操作类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BACTH_TRANS_TYPE")
private Integer transType;
@Column(name = "IS_OK")
@ApiParam(value = "是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isOk;
}

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

@ -592,4 +592,28 @@ public class WmsStockSn extends BaseBean {
this.modifyDatetime = modifyDatetime;
}
public WmsStockSn(WmsStockSn stockSn, String batchCode) {
this.organizeCode = stockSn.getOrganizeCode();
this.refSrc = stockSn.getRefSrc();
this.partNo = stockSn.getPartNo();
this.partNameRdd = stockSn.getPartNameRdd();
this.snType = stockSn.getSnType();
this.locateNo = stockSn.getLocateNo();
this.workCenterCode = stockSn.getWorkCenterCode();
this.packageNo = stockSn.getPackageNo();
this.shippingFlag = stockSn.getShippingFlag();
this.lotNo = stockSn.getLotNo();
this.dateCode = stockSn.getDateCode();
this.fixLotNo = stockSn.getFixLotNo();
this.leftCode = stockSn.getLeftCode();
this.qty = stockSn.getQty();
this.sn = stockSn.getSn();
this.createUser = stockSn.getCreateUser();
this.createDatetime = stockSn.getCreateDatetime();
this.modifyUser = stockSn.getModifyUser();
this.modifyDatetime = stockSn.getModifyDatetime();
this.refSrc = batchCode;
}
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java
Unescape Escape View File

@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
public class AssignmentDto {
@Id
@ -69,4 +67,5 @@ public class AssignmentDto {
public AssignmentDto() {
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java
Unescape Escape View File

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -17,7 +16,6 @@ import javax.persistence.Id;
* @CreateDate : 2020-04-21 2:37 下午
* @Modify:
**/
@Entity
@Data
@Api("窗口输出类")
public class WmsCustWindowDto {

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java
Unescape Escape View File

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
@Api("移动单效率(出参)")
public class WmsMoveMovementEffectivenessDto {

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
Unescape Escape View File

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
@Api("静态盘点查询输出实体类")
public class WmsStockSnDto {

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java
Unescape Escape View File

@ -5,8 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Entity;
/**
* @Description : 静态盘点输出model
* @Reference :
@ -15,7 +13,6 @@ import javax.persistence.Entity;
* @Modify:
**/
@Data
@Entity
@Api("静态盘点查询输出model")
public class WmsStaticCsModel extends BaseBean {
private static final long serialVersionUID = 9039981061448266666L;

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java
Unescape Escape View File

@ -1,15 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsSerialTrans;
/**
* @Description : 产品条码事务
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2020-05-21 15:53
* @Modify:
**/
public interface WmsSerialTransRepository extends BaseRepository<WmsSerialTrans, Long> {
}
Write Preview
Loading…
Cancel
Save