Merge branch 'refs/heads/rakor' into dev_zhangke

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java

@@ -39,7 +39,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public User getByCode(String code) {
-        return lambdaQuery().apply("LOWER({0}) = LOWER('{1}')", "user_code", code).one();
+        return lambdaQuery().apply("LOWER(user_code) = LOWER({0})", code).one();
     }
 
     @Transactional

nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml

@@ -5,7 +5,7 @@
     <select id="getTask" resultType="com.nflg.wms.repository.entity.WmsPoReceipt">
         select *
         from wms_po_receipt
-        where is_completed=false and sourceType=0
+        where is_completed=false and source_type=0
         <if test="orederNo !=null and orederNo !='' ">
             and ( order_no ilike #{orederNo} or in_num ilike #{orederNo} )
         </if>

nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml

@@ -9,7 +9,7 @@
         create_time,
         factory_code
         from wms_qc_receive
-        where is_completed !=2  and is_check = true and sourceType=0
+        where is_completed !=2  and is_check = true and source_type=0
         <if test="orderNo != null and orderNo != ''">
             and ( in_no ilike concat( '%',#{orderNo},'%') or order_no ilike concat( '%',#{orderNo},'%') )
         </if>