产品信息新增商品名称，打印修改，产品信息多个字段可自行维护

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java

@@ -216,7 +216,24 @@ public class UdiInfoController {
     @GetMapping("udiwms/udiinfo/local/filterByUuid")
     public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
 
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId());
+
+
+        udiRelevanceService.selectByUuid(productInfoFilterRequest.getUuid());
+
         List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest);
+
+
+        if (CollUtil.isNotEmpty(udiInfoEntities)) {
+            for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                if (udiRelevanceEntity != null) {
+                    udiInfoEntity.setManufactory(udiRelevanceEntity.getManufactory());
+                    udiInfoEntity.setMeasname(udiRelevanceEntity.getMeasname());
+                }
+            }
+        }
+
+
         return ResultVOUtils.success(udiInfoEntities);
     }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java

@@ -185,8 +185,6 @@ public class StockQRCodeTextController {
                 StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
                 if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
                     String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
-
-
                     String filePath = dirPath + "\\pdfprint\\" + fileName;
                     stockPrintTempEntity.setFileName(fileName);
                     stockPrintTempEntity.setFilePath(filePath);

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java

@@ -43,6 +43,7 @@ public class UdiInfoEntity {
     private String scbssfbhscrq;
     private String scbssfbhsxrq;
     private String cpms;
+    private String spmc;
     private String originUuid;
 
     //本地生成信息

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -58,5 +58,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String supName;
     private String unitFk;
     private String originUuid;
+    private String relId;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java

@@ -68,6 +68,7 @@ public class CompanyProductRelevanceResponse {
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
+    private String spmc;
 
     private String price;
 

api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java

@@ -63,12 +63,14 @@ public class UdiRelevanceResponse {
     private String cpms;
     private String supName;
     private String manufactory;
+    private String measname;
     private String unitFk;
     private String companyName;
     private String originUuid;
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
+    private String spmc;
 
     private String price;
 

api-admin/src/main/java/com/glxp/sale/admin/util/UdiInfoUtil.java

@@ -35,6 +35,7 @@ public class UdiInfoUtil {
                     udiInfoEntity.setAllowNoExpire(true);
                 }
             }
+
         }
 
         return udiInfoEntitys;

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -47,7 +47,7 @@
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
         basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,basic_products.allowNoBatch,
-        basic_products.allowNoExpire,basic_products.allowNoProduct
+        basic_products.allowNoExpire,basic_products.allowNoProduct,basic_products.spmc
         FROM (company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@@ -134,7 +134,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid,allowNoBatch,allowNoExpire,allowNoProduct)
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid,allowNoBatch,allowNoExpire,allowNoProduct,spmc)
         values
             (
         #{id},
@@ -167,7 +167,12 @@
         #{scbssfbhscrq},
         #{scbssfbhsxrq},
         #{cpms},
-        #{manufactory},#{originUuid},#{allowNoBatch},#{allowNoExpire},#{allowNoProduct}
+        #{manufactory},
+        #{originUuid},
+        #{allowNoBatch},
+        #{allowNoExpire},
+        #{allowNoProduct},
+        #{spmc}
         )
     </insert>
 
@@ -177,7 +182,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid,allowNoBatch,allowNoExpire,allowNoProduct
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid,allowNoBatch,allowNoExpire,allowNoProduct,spmc
         )
         values
 
@@ -210,6 +215,7 @@
             #{item.scbssfbhxlh},
             #{item.scbssfbhscrq},
             #{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory},#{item.originUuid},#{item.allowNoBatch},#{item.allowNoExpire},#{item.allowNoProduct}
+            ,#{item.spmc}
             )
         </foreach>
     </insert>
@@ -264,6 +270,7 @@
             <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
             <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
             <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
+            <if test="spmc != null">spmc=#{spmc},</if>
         </trim>
         WHERE nameCode = #{nameCode}
     </update>
@@ -290,7 +297,8 @@
         (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
         deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
         ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
-        productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,originUuid,allowNoBatch,allowNoExpire,allowNoProduct) values
+        productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,originUuid,allowNoBatch,allowNoExpire,allowNoProduct,spmc)
+        values
         <foreach collection="udiInfoEntities" item="item" index="index" separator=",">
             (#{item.id},
             #{item.nameCode},
@@ -324,7 +332,7 @@
             #{item.productType}, #{item.scbssfbhph},
             #{item.scbssfbhxlh},
             #{item.scbssfbhscrq},
-            #{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid},#{allowNoBatch},#{allowNoExpire},#{allowNoProduct})
+            #{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid},#{allowNoBatch},#{allowNoExpire},#{allowNoProduct},#{spmc})
         </foreach>
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -204,7 +204,7 @@
         basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
+        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc
         FROM basic_products
         right JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -51,7 +51,7 @@
         basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price
+        basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price,basic_products.spmc
         FROM company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -263,7 +263,7 @@
         stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
         stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
         stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
-        stock_order_detail.price,inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms,basic_udirel.measname
+        stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms,basic_udirel.measname
         FROM stock_order
         INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
@@ -271,7 +271,6 @@
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         left join basic_udirel on stock_order_detail.productId = basic_udirel.id
         left JOIN basic_products on basic_products.uuid = basic_udirel.uuid
-        left JOIN productinfo on productinfo.uuid = basic_products.originUuid
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}
@@ -298,13 +297,12 @@
             resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity">
         select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
         spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
-        basic_products.ylqxzcrbarmc,basic_products.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
-        inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms
+        basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
+        inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms
         from io_codes
         INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
         INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
         LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
-        left JOIN productinfo on productinfo.uuid = basic_products.originUuid
         <where>
             <if test="orderId != '' and orderId !=null">
                 and io_codes.orderId =#{orderId}