diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 1a9ecfe..74d7803 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -6,6 +6,7 @@ import lombok.Data; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Random; import java.util.UUID; /** @@ -22,7 +23,7 @@ public class SapBase { private String actusr = "导入"; @ApiParam(value = "SID", example = "-1") - private String sid = UUID.randomUUID().toString() + UUID.randomUUID().toString(); + private String sid = new Random().toString(); @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "接收数据日期", example = "-1") @@ -48,16 +49,16 @@ public class SapBase { private String actymd; @ApiParam(value = "处理时间", example = "-1") - private String acthms; + private String acthms ="00:00:00"; @ApiParam(value = "状态标志", example = "-1") - private String staflg; + private String staflg = "Y"; @ApiParam(value = "顺序号", example = "-1") - private Integer seq; + private Integer seq = new Random().nextInt(); @ApiParam(value = "GUID", example = "-1") - private String guid; + private String guid = UUID.randomUUID().toString(); public String getSynymdTime() { SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java new file mode 100644 index 0000000..89cd04f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 非JIS发运 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-20 13:24 + * @Modify: + **/ +@Data +@Api(value="非JIS发运",description = "非JIS发运") +public class SapDn extends SapBase{ + + @ApiParam(value = "销售交货单号",example = "1") + @AnnoOutputColumn + private String vbeln; + + @ApiParam(value = "行项目",example = "1") + @AnnoOutputColumn + private Integer posnr; + + @ApiParam(value = "发货工厂",example = "1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "发货库存地",example = "1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "计划交货日期",example = "1") + @AnnoOutputColumn + private String lfdat; + + @ApiParam(value = "客户编码",example = "1") + @AnnoOutputColumn + private String kunnr; + + @ApiParam(value = "物料号",example = "1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "客户物料号",example = "1") + @AnnoOutputColumn + private String kdmat; + + @ApiParam(value = "交货数量",example = "1") + @AnnoOutputColumn + private String lfimg; + + @ApiParam(value = "单位",example = "1") + @AnnoOutputColumn + private String meins; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java similarity index 76% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java index d466dd1..1f319e8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java @@ -14,11 +14,11 @@ import lombok.Data; **/ @Data @Api(value="零星领料(退)料结果",description = "零星领料(退)料结果") -public class WmsMiscr extends SapBase{ +public class SapMiscr extends SapBase{ @ApiParam(value = "编号",example = "1") @AnnoOutputColumn - private String refid; + private String zinstno; @ApiParam(value = "行号",example = "1") @AnnoOutputColumn @@ -44,17 +44,25 @@ public class WmsMiscr extends SapBase{ @AnnoOutputColumn private String erfme; - @ApiParam(value = "业务类型",example = "1") + @ApiParam(value = "特殊库存标识",example = "1") @AnnoOutputColumn - private String zaction; + private String sobkz; - @ApiParam(value = "交易日期",example = "1") + @ApiParam(value = "特殊库存描述",example = "1") @AnnoOutputColumn - private String zpost; + private String htext; - @ApiParam(value = "交易时间",example = "1") + @ApiParam(value = "状态",example = "1") @AnnoOutputColumn - private String ztime; + private String zzlzt; + + @ApiParam(value = "业务类型",example = "1") + @AnnoOutputColumn + private String zaction; + + @ApiParam(value = "领料单号",example = "1") + @AnnoOutputColumn(hidden = true) + private String sgtxt; public Double getZeileVal() { return zeile== null ? 0D : this.zeile.doubleValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java new file mode 100644 index 0000000..cc3a4e4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 销售退货 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-20 13:32 + * @Modify: + **/ +@Data +@Api(value="销售退货",description = "销售退货") +public class SapRdn extends SapBase{ + + @ApiParam(value = "销售交货单",example = "1") + @AnnoOutputColumn + private String vbeln; + + @ApiParam(value = "Item",example = "1") + @AnnoOutputColumn + private Integer posnr; + + @ApiParam(value = "收货工厂",example = "1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "收货库存地",example = "1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "收货日期",example = "1") + @AnnoOutputColumn + private String lfdat; + + @ApiParam(value = "客户编码",example = "1") + @AnnoOutputColumn + private String kunnr; + + @ApiParam(value = "物料号",example = "1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "收货数量",example = "1") + @AnnoOutputColumn + private String lfimg; + + @ApiParam(value = "物料单位",example = "1") + @AnnoOutputColumn + private String meins; + + +}