列表查询预订单

供应商列表返回是否一级

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListFactoryRes.java

@@ -70,6 +70,9 @@ public class ListFactoryRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "文件最大数")
         private Long maxFileCount;
 
+        @ApiModelProperty(value = "是否一级包材厂")
+        private Integer isFirstFactory;
+
         @ApiModelProperty(value = "描述")
         private String description;
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -43,7 +43,7 @@
             bookingOrder.id,
             bookingOrder.booking_order,
             bookingOrder.sap_order_no,
-            material.material_name,
+            bookingOrder.material_name,
             bookingOrder.purchase_count,
             bookingOrder.qr_type,
             factory.factory_name,
@@ -54,7 +54,6 @@
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order and package.is_delete=0
-            LEFT JOIN base_material AS material ON material.id = package.material_id
             LEFT JOIN base_factory AS factory ON factory.id = bookingOrder.factory_cover_id
             LEFT JOIN user_info AS ui on package.update_by = ui.id
         <where>
@@ -66,7 +65,7 @@
                 AND package.sap_order_no LIKE CONCAT('%',#{queryOrderFormLimitReq.sapOrder},'%')
             </if>
             <if test="null != queryOrderFormLimitReq.materialName and queryOrderFormLimitReq.materialName != ''">
-                AND material.material_name LIKE CONCAT('%',#{queryOrderFormLimitReq.materialName},'%')
+                AND bookingOrder.material_name LIKE CONCAT('%',#{queryOrderFormLimitReq.materialName},'%')
             </if>
             <if test="null != queryOrderFormLimitReq.factoryCoverId and  queryOrderFormLimitReq.factoryCoverId != ''">
                 AND factory.id = #{queryOrderFormLimitReq.factoryCoverId}

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/EncryptionTest.java

@@ -2,6 +2,7 @@ package com.abi.qms.platform;
 
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.AES;
+import com.abi.qms.platform.infrastructure.util.AesEncodeUtil;
 import com.abi.task.common.api.exception.BusinessException;
 import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 import lombok.extern.slf4j.Slf4j;
@@ -31,27 +32,15 @@ public class EncryptionTest {
         return encryptDataEncode;
     }
 
-    /**
-     * 测试
-     *
-     * @param args
-     * @throws Exception
-     */
-    public static void main(String[] args) throws Exception {
-        System.out.println("开始");
-        String sp_jia = "D:\\test\\test+\\100w.txt";//加密后文件
-        String sp = "D:\\test\\100w.txt";//原始文件
-        String sp_jie = "D:\\test\\test-\\100w.txt";//解密后文件
-        String readToString = readToString(sp);//读取文件
-        String jiami = encryptAES(readToString, key);
-        getFile(jiami, sp_jia);//加密
-        System.out.println("写入完毕");
-        String readToString_jia = readToString(sp_jia);//读取文件
-        String jiemi = jmencryptAES(readToString_jia, key);
-        getFile(jiemi, sp_jie);//解密
-        System.out.println("完毕");
+
+    public static void main(String[] args) {
+        String a = "hwc6davQc6wAsDKz3zIuBQ==";
+        String s = AesEncodeUtil.aesDecode(a, "EC/Z+S7c3EFJa2dtvLyekg==");
+        System.out.println(s);
     }
 
+
+
     /**
      * 写入文件
      *