diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java index 707ef98..a503fe6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -28,7 +28,6 @@ public class WmsBsonPack { bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson); bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson); - bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson); bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson); diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 0eb6e4c..a1d0033 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -80,7 +80,7 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "CHECK_CODE") @ApiParam(value = "检验编号") - public String CHECK_CODE; + public String checkCode; @Column(name = "STOVE_NO") @ApiParam(value = "炉批号") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java new file mode 100644 index 0000000..ed7f4c7 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 供应商登录用户模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-12 13:13 + * @Modify: + **/ +@Data +@AllArgsConstructor +public class SwebLoginUserModel implements Serializable { + + @ApiParam(value = "用户名") + private String userName; + + @ApiParam(value = "密码") + private String password; + + @ApiParam(value = "获取图片密码的唯一凭证") + private String uniqueId; + + @ApiParam(value = "ip地址") + private String ip; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index c44ee4b..335e031 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -20,7 +20,7 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @Column(name = "ORDER_NO") @ApiParam("单据号") - public String orderNo; + private String orderNo; @Column(name = "PART_NO") @ApiParam(value = "零件号") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java index 78021a0..4c2464f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java @@ -18,8 +18,8 @@ import java.util.List; public class SwebPOForPubListResultModel extends BaseBean { @ApiParam(value = "拆分请求时间数量列表", example = "1") - public List reqTimeList; + private List reqTimeList; @ApiParam(value = "分页列表", example = "1") - public ListPager pageList; + private ListPager pageList; }