单据打印新增批次号打印，清单打印，解决服务端打印时出现乱码下划线问题

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

@@ -169,6 +169,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
         udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
+        udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
         udiRelevanceEntity.setSupName(combineRequest.getSupName());
         udiRelevanceEntity.setPrice(combineRequest.getPrice());
         UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
@@ -226,6 +227,8 @@ public class UdiContrastController {
             combineRequest.setRelId(removeRelRequest.getRelId());
             udiRelevanceEntity.setSupName("");
             udiRelevanceEntity.setPrice("");
+            udiRelevanceEntity.setManufactory("");
+            udiRelevanceEntity.setMeasname("");
             udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         } catch (Exception e) {
             e.printStackTrace();
@@ -277,6 +280,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
         udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
+        udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
         if (combineRequest.getManufactory() != null) {
             udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
         } else
@@ -313,6 +317,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
         udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
         udiRelevanceEntity.setMainName(thrProductsEntity.getName());
+        udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);

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

@@ -473,8 +473,6 @@ public class StockQRCodeTextController {
             }
         }
         return null;
-
-
     }
 
 

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

@@ -21,6 +21,7 @@ public class CombineRequest {
     private Long customerId;
     private Boolean supEnable;
     private String manufactory;
+    private String measname;
     private String supName;
     private String price;
     private boolean idSpliUdi;

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java

@@ -137,6 +137,7 @@ public class BasicBackUpdateProductService {
                             udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4());
                         }
                         udiRelevanceEntity1.setManufactory(invmandocResponse.getManufactory());
+                        udiRelevanceEntity1.setMeasname(invmandocResponse.getMeasname());
                         udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
                         udiRelevanceEntity1.setThirdName(invmandocResponse.getName());
                         String time = DateUtil.getDateTime();
@@ -243,6 +244,7 @@ public class BasicBackUpdateProductService {
                         }
                         udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
                         udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
+                        udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
                         udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
                         udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
                         String time = DateUtil.getDateTime();

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java

@@ -101,7 +101,8 @@ public class BasicUpdateProductService {
                     udiRelevanceEntity1.setModifyTime(time);
                     udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
                     udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
-                    udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory());
+                    udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
+                    udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
                     BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
                     String mainSys = basicThirdSysEntity.getThirdId();
                     if (mainSys.equals("thirdId")) {
@@ -177,7 +178,7 @@ public class BasicUpdateProductService {
                     udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
                     udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
                     udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory());
-
+                    udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
                     BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
                     String mainSys = basicThirdSysEntity.getThirdId();
                     if (mainSys.equals("thirdId")) {

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

@@ -400,7 +400,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
         )
         values
             (
@@ -429,7 +429,9 @@
         #{lockStatus},
         #{udplatCode},
         #{isAdavence},
-        #{supName},#{price}
+        #{supName},
+        #{price},
+        #{modifyTime}
         )
     </insert>
 
@@ -442,7 +444,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
         )
         values
             (
@@ -472,7 +474,8 @@
         #{udplatCode},
         #{isAdavence},
         #{supName},
-        #{price}
+        #{price},
+        #{modifyTime}
         )
     </insert>
 
@@ -548,7 +551,7 @@
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3,
         thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
-        measname, isDisable, mainId, mainName, udplatCode,supName,price)
+        measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime)
         values
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
@@ -572,7 +575,7 @@
             #{item.isDisable},
             #{item.mainId},
             #{item.mainName},
-            #{item.udplatCode},#{item.supName},#{item.price})
+            #{item.udplatCode},#{item.supName},#{item.price},#{item.modifyTime})
         </foreach>
     </insert>
 </mapper>

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

@@ -263,7 +263,8 @@
         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 FROM stock_order
+        stock_order_detail.price,inv_warehouse.name locInv,productinfo.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`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
@@ -287,10 +288,6 @@
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode = #{invWarehouseCode}
             </if>
-            <!--            <if test="userId!=null">-->
-            <!--                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or-->
-            <!--                invWarehouseCode is null or invWarehouseCode='')-->
-            <!--            </if>-->
 
         </where>
         group by stock_order_detail.id
@@ -300,14 +297,14 @@
     <select id="listCodePrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             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_products.measname,basic_products.zczbhhzbapzbh,
-        inv_warehouse.name locInv
+        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
         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}