diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java new file mode 100644 index 0000000..d213172 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java @@ -0,0 +1,149 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 java.util.UUID; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-13 13:42 + * @Modify: + **/ +@Data +@Api(value="要货计划",description = "要货计划") +public class SapDspo { + + @ApiParam(value = "SA编号(或PO号)",example = "1") + @AnnoOutputColumn + private String ebeln; + + @ApiParam(value = "版本",example = "-1") + @AnnoOutputColumn + private String revno; + + @ApiParam(value = "SAitem或PO item",example = "-1") + @AnnoOutputColumn + private Integer evrtp; + + @ApiParam(value = "供应商代码",example = "-1") + @AnnoOutputColumn + private String lifnr; + + @ApiParam(value = "物料编码",example = "-1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "计量单位",example = "-1") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "数量",example = "-1") + @AnnoOutputColumn + private Double zdevNum; + + @ApiParam(value = "特殊采购标识",example = "-1") + @AnnoOutputColumn + private String pstyp; + + @ApiParam(value = "计划交货日期",example = "-1") + @AnnoOutputColumn + private String zdate; + + @ApiParam(value = "计划交货时间",example = "-1") + @AnnoOutputColumn + private String zcjsj; + + @ApiParam(value = "工厂代码",example = "-1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "收货库存地点",example = "-1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "凭证标识",example = "-1") + @AnnoOutputColumn + private String zpzps; + + @ApiParam(value = "状态",example = "-1") + @AnnoOutputColumn + private String zstas; + + @ApiParam(value = "状态",example = "-1") + @AnnoOutputColumn + private String loekz; + + @ApiParam(value = "最小包装数量",example = "-1") + @AnnoOutputColumn + private Double bstrf; + + @ApiParam(value = "条码已打印的数量",example = "-1") + @AnnoOutputColumn + private Double prnnum; + + //公共字段 ++++++++++++++++++++++++++++++++++++++++++ + @ApiParam(value = "处理人",example = "-1") + @AnnoOutputColumn + private String actusr = "导入"; + + @ApiParam(value = "SID",example = "-1") + @AnnoOutputColumn + private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString(); + + /*@ApiParam(value = "接收数据日期",example = "-1") + @AnnoOutputColumn + private String recymd; + + @ApiParam(value = "接收数据时间",example = "-1") + @AnnoOutputColumn + private String rechms; + + @ApiParam(value = "同步标志",example = "-1") + @AnnoOutputColumn + private String synflg;*/ + + @ApiParam(value = "同步日期",example = "-1") + @AnnoOutputColumn + private String synymd; + + @ApiParam(value = "同步时间",example = "-1") + @AnnoOutputColumn + private String synhms; + + /*@ApiParam(value = "处理标志",example = "-1") + @AnnoOutputColumn + private String actflg;*/ + + @ApiParam(value = "处理日期",example = "-1") + @AnnoOutputColumn + private String actymd; + + @ApiParam(value = "处理时间",example = "-1") + @AnnoOutputColumn + private String acthms; + + @ApiParam(value = "状态标志",example = "-1") + @AnnoOutputColumn + private String staflg; + + @ApiParam(value = "顺序号",example = "-1") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "GUID",example = "-1") + @AnnoOutputColumn + private String guid; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index a37421b..b2409cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -34,8 +34,9 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("物料编码") public String partNo; - @Column(name = "BOX_QTY") - @ApiParam("箱数") + @Column(name = "BOX_QTY" ) + @ColumnDefault("0") + @ApiParam(value ="箱数", example = "0") public Integer boxQty; @Column(name = "PART_NAME_RDD") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index f79829d..c945e71 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -28,6 +28,11 @@ public class MappingItem { */ public String destName; /** + * 该字段在目标表是不是主键 + * 1=主键 + */ + public Integer destPk; + /** * 目标字段的默认值,通过此默认值识别字段类型,一定要配置正确 * 可以使用的表达式: #date, #time, #guid, #Q.warehouse(#zone) */ @@ -39,6 +44,7 @@ public class MappingItem { + this.srcName + ", destBeanName:" + this.destBeanName + ", destName" + this.destName + ", defaultValue:" - + this.defaultValue; + + this.defaultValue + ", destPk:" + + this.destPk; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index d12ebd1..7f56b8d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -89,4 +89,11 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "DEST_COLUMN_MAPPING", length = 5000) public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名:SAP2WMS, WMS2SAP, MES2WMS + */ + @Column(name = "GROUP_NAME") + public String groupName; }