From ce0da2cd18b3d9ebc4db2aefce4113b78cf96233 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 28 Jun 2023 09:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/thrsys/ThrProductsController.java | 6 +++--- src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java | 2 +- .../java/com/glxp/api/entity/inout/IoCodeTempEntity.java | 2 +- .../com/glxp/api/entity/purchase/PurOrderDetailEntity.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 92278bca..147c4b09 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -187,7 +187,7 @@ public class ThrProductsController { udiProductEntity.setMeasname(thrProductsEntity.getMeasname()); if (StrUtil.isNotEmpty(thrProductsEntity.getSpec())) udiProductEntity.setGgxh(thrProductsEntity.getSpec()); - if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) + else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) udiProductEntity.setGgxh(thrProductsEntity.getStandard()); if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); @@ -211,8 +211,8 @@ public class ThrProductsController { udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc()); if (StrUtil.isNotEmpty(thrProductsEntity.getCpms())) udiProductEntity.setCpms(thrProductsEntity.getCpms()); - if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) - udiProductEntity.setGgxh(thrProductsEntity.getStandard()); +// if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) +// udiProductEntity.setGgxh(thrProductsEntity.getStandard()); udiProductService.updateUdiInfo(udiProductEntity); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index b4a6be1f..5b759e50 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -140,7 +140,7 @@ public class IoCodeEntity implements Serializable { private Date createTime; @TableField(exist = false) - private Integer status; //条码校验状态 + private int status; //条码校验状态 @TableField(exist = false) private int scanCount; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index 2d0c9c30..79c93765 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -137,7 +137,7 @@ public class IoCodeTempEntity { private Date createTime; @TableField(exist = false) - private Integer status; //条码校验状态 + private int status; //条码校验状态 @TableField(exist = false) private String mySupId; //更新供应商 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index 914bc521..23cfcb99 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -24,7 +24,7 @@ public class PurOrderDetailEntity { * 产品ID */ @TableField(value = "productId") - private Integer productId; + private Long productId; /** * 产品名称