Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java

@@ -35,7 +35,7 @@ public class PurApplyEntity {
      * 申购类型
      */
     @TableField(value = "billType")
-    private Integer billType;
+    private String billType;
 
     /**
      * 申购说明

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -179,5 +179,17 @@ public class ThrProductsEntity {
     @TableField("updateUser")
     private String updateUser;
 
+    /**
+     * 生产厂家编码
+     */
+    @TableField("manufactoryCode")
+    private String manufactoryCode;
+
+    /**
+     * 配送企业编码
+     */
+    @TableField("supCode")
+    private String supCode;
+
 
 }

src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java

@@ -1,8 +1,10 @@
 package com.glxp.api.entity.thrsys;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName("thr_system_detail")
 public class ThrSystemDetailEntity {
 
     private Integer id;

src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java

@@ -38,4 +38,5 @@ public class InnerOrderPrintResponse {
     private Integer count;
     private String corpName;
 
+    private Integer status;
 }

src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java

@@ -19,7 +19,9 @@ public class PurOrderDetailResponse {
     private int reCount;
     private int planCount;
     private Integer sweepCount;
+    //注册/备案人
     private String ylqxzcrbarmc;
+    //注册/备案号
     private String zczbhhzbapzbh;
     private BigDecimal price;
     private String relId;
@@ -46,9 +48,10 @@ public class PurOrderDetailResponse {
     private int acceptCount;
     private String measname;
     private String supId;
-
+//供应商
     private String supName;
-
+//采购单号
     private String billNo;
+
     private String nameCode;
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -191,6 +192,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                     } else {
                         boolean isChange = verifyDataChange(thrProductsEntity, item);
                         if (isChange) {
+                            BeanUtil.copyProperties(item,thrProductsEntity,new CopyOptions().setIgnoreNullValue(true));
                             thrProductsEntity.setUpdateTime(new Date());
                             thrProductsDao.updateEntityById(thrProductsEntity);
                         }

src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml

@@ -43,6 +43,8 @@
           resultType="com.glxp.api.res.inv.InnerOrderPrintResponse">
     SELECT inv_inner_order_print.id,
     inv_inner_order_print.udiCode,
+    inv_inner_order_print.updateTime,
+    inv_inner_order_print.status,
     basic_products.nameCode,
     inv_inner_order_print.batchNo,
     inv_inner_order_print.productDate,

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

@@ -1,5 +1,10 @@
 #   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
 
+CALL Pro_Temp_ColumnWork('thr_products', 'manufactoryCode',
+                         'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'supCode',
+                         'varchar(255) ', 1);
+
 CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath',
                          'varchar(255) ', 1);