成品粮订单

Signed-off-by: tangsong <86121657@qq.com>

src/main/resources/mapper/business/qcrk/DataCrkywTzdxxDefaultMapper.xml

@@ -228,8 +228,8 @@ LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = DATA_CRKYW_TZD
         notice.id AS tzdID, -- 通知单id
         notice.bill_number AS tzdbh, -- 通知单编号,
         shiping_count  as sl, -- 通知单数量
-        IF(detail.in_count > 0,in_count,out_count)-IFNULL(detail.complete_quantity,0) AS sysl, -- 剩余数量
-        IF(detail.in_count > 0,'A7B1FDB54DE7B32D6F8067FEFE2BF52F','6FD0418CD28A2B3F3E7E9EC0D7429461') as FLOWID, -- 流程Id
+        CASE WHEN notice.bill_type=1 THEN in_count-IFNULL(detail.complete_quantity,0) ELSE out_count-IFNULL(detail.complete_quantity,0) END AS sysl, -- 剩余数量
+        CASE WHEN notice.bill_type=1 THEN '420801654D8F01A7D9FCE01B90A395E6' ELSE '284344D15DCA72D90AA43C24BD4F9B47' END AS FLOWID, -- 流程Id
         DATE_FORMAT(detail.input_time,'%Y-%m-%d %T') AS rcsj -- 入仓时间
         ,notice.contract AS htbh -- 合同编号
         ,notice.contract_bid AS htId -- 合同id
@@ -283,12 +283,12 @@ LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = DATA_CRKYW_TZD
         LEFT JOIN basic_enum grain_grade_enum ON grain_grade_enum.enumId = detail.grain_grade
         LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = detail.grain_kind
         LEFT JOIN basic_enum grain_detail_kind_enum ON grain_detail_kind_enum.enumId = detail.grain_detail_kind
-
-        WHERE ((notice.audit_state=2) or (notice.bill_type=2)) -- <!-- 审批通过的,中转通知单没有审批 -->
+        WHERE
+        notice.audit_state=2
         and notice.in_application = 1
         AND notice.house_id = #{unitId}   -- <!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
-        and IF(detail.in_count > 0,'A7B1FDB54DE7B32D6F8067FEFE2BF52F','6FD0418CD28A2B3F3E7E9EC0D7429461') = #{flowId}
-        AND IF(detail.in_count > 0,in_count,out_count)-IFNULL(detail.complete_quantity,0) >0
+        and  CASE WHEN notice.bill_type=1 THEN '420801654D8F01A7D9FCE01B90A395E6' ELSE '284344D15DCA72D90AA43C24BD4F9B47'  = #{flowId}
+        AND CASE WHEN notice.bill_type=1 THEN in_count-IFNULL(detail.complete_quantity,0) ELSE out_count-IFNULL(detail.complete_quantity,0) END >0
         ORDER BY notice.bill_number
     </select>
 </mapper>

src/main/resources/mapper/cplbusiness/DataCrkywCpltzdxxDefaultMapper.xml

@@ -215,12 +215,12 @@
     </select>
     <select id="getPgGopsPlanList" resultType="com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO">
         SELECT
-        a.id as "DataID",
+        a.id as "ddid",
         GROUP_CONCAT(c.sjjlspmc) as 'mxpzValue',
         '' as  "kfbh",
         a.org_id as "orgId",
         a.updatedate as "ModifyDate",
-        a.plan_code as "tzdbm",
+        a.plan_code as "ddbh",
         a.plan_name as "jhdmc",
         '' as  "htmc",
         a.plan_type "cazylx",