新增生产企业统一社会信用代码字段

src/main/java/com/glxp/api/entity/basic/BasicUdiProductEntity.java

@@ -357,9 +357,14 @@ public class BasicUdiProductEntity implements Serializable {
     @ApiModelProperty(value = "分类编码对应分类名称")
     @TableField(value = "categoryName")
     private String categoryName;
-    @ApiModelProperty(value = "制造商")
+    @ApiModelProperty(value = "生产企业")
     @TableField(value = "manufactory")
     private String manufactory;
+
+    @ApiModelProperty(value = "生产企业统一社会信用代码")
+    @TableField(value = "manuCerditCode")
+    private String manuCerditCode;
+
     @ApiModelProperty(value = "计量单位名称")
     @TableField(value = "measname")
     private String measname;

src/main/java/com/glxp/api/req/basic/BasicUdiRelRequest.java

@@ -60,8 +60,10 @@ public class BasicUdiRelRequest {
 
 
     //    器械字典设置
-    @ApiModelProperty(value = "器械字典设置")
+    @ApiModelProperty(value = "生产企业")
     private String manufactory;
+    @ApiModelProperty(value = "生产企业统一社会信用代码")
+    private String manuCerditCode;
     @ApiModelProperty(value = "测量名称")
     private String measname;
     @ApiModelProperty(value = "商品名称")

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -108,6 +108,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String certIdFk;
     @ApiModelProperty(value = "制造商")
     private String manufactory;
+    @ApiModelProperty(value = "生产企业统一社会信用代码")
+    private String manuCerditCode;
     @ApiModelProperty(value = "统一社会信用代码")
     private String tyshxydm;
     @ApiModelProperty(value = "派遣")

src/main/java/com/glxp/api/req/basic/SupplementRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 //选入产品补充信息
@@ -19,6 +20,7 @@ public class SupplementRequest {
     private String ybbm;
     private String measname;
     private String manufactory;
+    private String manuCerditCode;
     private String spmc;
     private String cpms;
     private String price;

src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -34,6 +35,7 @@ public class UdiInfoRequest {
     private String ybbm;
     private String sptm;
     private String manufactory;
+    private String manuCerditCode;
     private String measname;
     private Integer productType;
     private String scbssfbhph;

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -20,6 +21,7 @@ public class UdiRelevanceRequest {
     private String thirdName3;
     private String thirdName4;
     private String manufactory;
+    private String manuCerditCode;
     private String measname;
     private String ybbm;
     private String sptm;

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -60,6 +61,7 @@ public class UdiRelevanceSaveRequest {
     private String ybbm;
     private String sptm;
     private String manufactory;
+    private String manuCerditCode;
     private String measname;
     private Integer productType;
     private String scbssfbhph;

src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java

@@ -2,6 +2,7 @@ package com.glxp.api.req.purchase;
 
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -13,6 +14,7 @@ public class FilterPoductRequest extends ListPageRequest {
     private String recordProductName;
     private String recordPeopleName;
     private String manufactory;
+    private String manuCerditCode;
     private String cpmctymc;
 
     private String productId;

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.thrsys;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -30,6 +31,7 @@ public class AddThrDiProductsRequest {
     private String sptm;
     private String ybbm;
     private String measname;
+    private String manuCerditCode;
     private String manufactory;
     private String spmc;
     private String cpms;

src/main/resources/schemas/schema_v2.1.sql

@@ -345,6 +345,5 @@ SET FOREIGN_KEY_CHECKS = 1;
 
 
 CALL Pro_Temp_ColumnWork('user_company_online', 'offlineStat', 'int', 1);
-
-
+CALL Pro_Temp_ColumnWork('basic_udi_product', 'manuCerditCode', 'varchar(255)', 1);