aps-甘特图批次号取值逻辑优化详情testin1808

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -192,7 +192,7 @@
         a3.PLANHAVEMATERIALDATE as planhavematerialdate,
         a2.SINGLEROLLWEIGHT,
         a2.SINGLEROLLWEIGHT * a1.PLANPROCESSRALL as totalRollWeight,
-        IF (
+        IF(IF (
         IFNULL(a1.BACHMATERIALPROCESS,'')=''and IFNULL(a1.DOINGBATCHNUMBER,'')=''and IFNULL(a1.REPORTBATCHNUMBER,'')='',
         a1.BLANKBATCHNUMBER,
         IF
@@ -215,7 +215,7 @@
         ( a1.REPORTBATCHNUMBER = '', NULL, trim( BOTH ',' FROM a1.REPORTBATCHNUMBER ) )
         )
         )
-        ) AS SHOWBATCHNUMBER
+        )='',a2.PREVIOUSPROCESSID IS NULL AND a3.PREPAREMATERIAL = '是',a3.PREPAREMATERIALBATCHNO ) AS SHOWBATCHNUMBER
         FROM
         (SELECT
         a3.*,