Merge remote-tracking branch 'remotes/origin/dev-2.13.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/crk/mapper/mapping/CrkMapper.xml

@@ -206,7 +206,7 @@
     <select id="getBusinessRecordDetail" parameterType="com.unis.mobileInfo.modular.crk.param.BusinessRecordParam" resultType="java.util.Map">
         <!-- 1入库 2出库-->
         <if test="businessRecordParam.ywlx == 1 ">
-            SELECT
+        select
             a.BizNo BizNo,
             -- 单据号
             a.UnitID,
@@ -220,7 +220,6 @@
             c.cmsj,
             a.cph,
             -- 车辆编号
-            a.cyr,
             a.lsxz,
             e1.enumname lsxzmc,
             -- 粮食性质
@@ -293,7 +292,7 @@
             -- 扦样人
             jy.jydh jydh,
             -- 化验单号
-            e7.enumname jyjg,
+            case jy.jyjg when '3145' then '不合格' when '3146' then '合格' end jyjg ,
             -- 检验结果
             jy.jyr jyr,
             -- 检验人
@@ -330,7 +329,7 @@
             -- 现场扣杂
             b.xcks xcks,
             -- 现场扣水
-            b.zyjssj zyjssj,
+            b.zyjssj zykssj,
             -- 作业开始时间
             b.zyjssj zyjssj,
             -- 作业结束时间
@@ -352,7 +351,6 @@
             INNER JOIN depot_qh.basic_enum e4 ON e4.enumId = a.cd
             INNER JOIN depot_qh.basic_enum e5 ON e5.enumId = a.cchlx
             INNER JOIN depot_qh.basic_enum e6 ON e6.enumId = a.scnf
-            INNER JOIN depot_qh.basic_enum e7 ON e7.enumId = jy.jyjg
             INNER JOIN depot_qh.basic_storehouse g ON g.storehouse_id = b.sjchID
             INNER JOIN depot_qh.basic_warehouse h ON h.warehouse_id = b.sjhwID
             INNER JOIN depot_qh.data_crkyw_qyxx_default qy ON qy.BizNo = a.BizNo