feature 代码提交

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

@@ -146,47 +146,47 @@
     <select id="getGanttDataList" resultType="com.rongwei.bsentity.vo.GanttVos">
         SELECT
         UUID_SHORT() as uuid,
-        a4.PRODUCTNAME,
+        a1.ID,
         a1.PLANPROCESSRALL,
-        a2.PROCESSSTATUS,
         a1.PLANSTARTDATE,
         a1.PLANENDDATE,
-        a2.ACTUALSTARTDATE,
-        a2.ACTUALFINISHDATE,
         a1.PROCESSWORKSHOPID,
         a1.PROCESSWORKSHOP,
         a1.PROCESSDEVICEID,
         a1.PROCESSDEVICE,
-        DATE(a3.DELIVERYDATE) AS DELIVERYDATE,
-        a2.PROCESSNAME,
         a1.STARTINGROLL,
         a1.REPORTROLL,
         a1.CHECKOUTROLL,
         a1.UNFINISHROLL,
         a1.WORKSTATUS,
-        a2.LOCKMARK,
-        a1.HASCONFLICT,
         a1.CONFLICTDES,
-        (select CUSTOMERABBREVIATION from aps_customer_management where ID = a6.CUSTOMID and DELETED ='0') AS CUSTOMERABBREVIATION,
-        a1.ID,
+        a1.HASCONFLICT,
+        a1.SOFTCONFLICTDES,
+        a1.nextprocessesids,
+        a1.previousprocessesids,
+        a2.ID as processid,
+        a2.PLANINPUT AS INMATERCONDITION,
+        a2.PROCESSSTATUS,
+        a2.ACTUALSTARTDATE,
+        a2.ACTUALFINISHDATE,
+        a2.PROCESSNAME,
+        a2.LOCKMARK,
+        a2.PROCESSWAY,
         a3.ID AS blankOrderId,
+        a3.OUTPUTORDERPRODUCT,
+        DATE(a3.PROMISEDATESTART) AS PROMISEDATESTART,
+        DATE(a3.PROMISEDATEEND) AS PROMISEDATEEND,
+        DATE(a3.DELIVERYDATE) AS DELIVERYDATE,
+        a4.PRODUCTNAME,
         a6.ID AS productionorderid,
         a6.ORDERNO,
         a6.CUSTOMNAME,
         a6.ORDERDATE,
-        a7.CUSTOMERUNIT,
-        a2.ID as processid,
+        a6.CUSTOMORDERNO,
         Date(a6.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
         Date(a6.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,
-        a1.SOFTCONFLICTDES,
-        a2.PLANINPUT AS INMATERCONDITION,
-        a6.CUSTOMORDERNO,
-        a3.OUTPUTORDERPRODUCT,
-        a2.PROCESSWAY,
-        DATE(a3.PROMISEDATESTART) AS PROMISEDATESTART,
-        DATE(a3.PROMISEDATEEND) AS PROMISEDATEEND,
-        a1.nextprocessesids,
-        a1.previousprocessesids
+        a7.CUSTOMERABBREVIATION as CUSTOMERABBREVIATION,
+        a7.CUSTOMERUNIT
         FROM
         aps_process_operation_process_equ a1
         LEFT JOIN aps_process_operation a2 ON a1.PROCESSID = a2.ID
@@ -235,7 +235,6 @@
             <if test="processids != null ">and a1.PROCESSID in (${processids})</if>
         </where>
         order by a1.PROCESSWORKSHOP,a1.PROCESSDEVICE,a1.PLANSTARTDATE asc,a1.PLANENDDATE
-#                  ,c.VALUE asc
     </select>
     <select id="selectNeedUpdate" resultType="com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq">
         SELECT

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

@@ -47,7 +47,7 @@
     <select id="selectInputAndOutputNumByProcessId" resultType="com.rongwei.bsentity.vo.ProcessOutputAndInputNumber">
         SELECT
             arr.PROCESSOPERATIONID as processId,
-        CONCAT(GROUP_CONCAT(DISTINCT arr.BATCHNUMBER ),"-;-",GROUP_CONCAT( DISTINCT aro.OUTPUTNUMBER )) as number
+        IFNULL(CONCAT(GROUP_CONCAT(DISTINCT arr.BATCHNUMBER ),"-;-",GROUP_CONCAT( DISTINCT aro.OUTPUTNUMBER )),'') as number
         FROM
             aps_report_records arr
             LEFT JOIN aps_report_output aro ON arr.ID = aro.MAINID