Browse Source

sap item只能查询出没有维护的or确定是二维码的物料

tanzhongran 3 năm trước cách đây
mục cha
commit
0200555633

+ 5 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageSapOrderItemMapper.java

@@ -2,6 +2,9 @@ package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.QrPackageSapOrderItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface QrPackageSapOrderItemMapper extends BaseMapper<QrPackageSapOrderItem> {
 
+    List<QrPackageSapOrderItem> listSapOrderItemOnlyQrCode(@Param("sapOrderNo") String sapOrderNo);
+
 }

+ 1 - 4
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/SapBaseQueryServiceImpl.java

@@ -136,10 +136,7 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     @Override
     public ListMaterialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq req) {
         //查询
-        QueryWrapper<QrPackageSapOrderItem> orderItemQw = new QueryWrapper<>();
-        orderItemQw.eq("sap_order_no", req.getSapOrderNo());
-        orderItemQw.eq("is_delete", 0);
-        List<QrPackageSapOrderItem> sapOrderItemList = qrPackageSapOrderItemMapper.selectList(orderItemQw);
+        List<QrPackageSapOrderItem> sapOrderItemList = qrPackageSapOrderItemMapper.listSapOrderItemOnlyQrCode(req.getSapOrderNo());
 
         //构造出参
         ListMaterialBySapOrderRes res = new ListMaterialBySapOrderRes();

+ 14 - 0
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageSapOrderItemMapper.xml

@@ -23,4 +23,18 @@
         ID, SAP_ORDER_NO, SAP_MATERIAL_ID, SAP_MATERIAL_NAME, SAP_COVER_FACTORY_ID, SAP_BEER_FACTORY_ID, PURCHASE_COUNT, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
     </sql>
 
+    <select id="listSapOrderItemOnlyQrCode" resultType="com.abi.qms.platform.dao.entity.QrPackageSapOrderItem">
+
+        select item.*
+        from qr_package_sap_order_item item
+        left join base_material m on item.sap_material_id = m.material_code and m.is_delete=0
+
+        <where>
+            item.sap_order_no = #{sapOrderNo}
+            and item.is_delete=0
+            and (m.has_qr=1 or m.has_qr is null)
+        </where>
+
+    </select>
+
 </mapper>

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

@@ -94,17 +94,17 @@ public class EncryptionTest {
      * @param writeFilePath
      */
     public static void readAndDecodeToFile(String readFilePath,String writeFilePath){
-        String content = readToString("D:\\0.txt");
+        String content = readToString(readFilePath);
         String decodeStr = AesEncodeUtil.aesDecode(content, key);
         try{
-            outputFile(decodeStr,"D:\\decode.txt");
+            outputFile(decodeStr,writeFilePath);
         }catch (Exception e){
 
         }
     }
 
     public static void main(String[] args) {
-        readAndDecodeToFile("D:\\0.txt","D:\\decode.txt");
+        readAndDecodeToFile("D:\\IQMS0.txt","D:\\decode.txt");
     }
 
     /**