|
|
@@ -230,7 +230,7 @@ public class index : IHttpHandler
|
|
|
TPPD.GOODSLEVELID,
|
|
|
NULL AS KingdeeCode,
|
|
|
TPPD.CHECKFLAG,
|
|
|
- TPGR.CREATETIME
|
|
|
+ TPPD.CREATETIME
|
|
|
FROM
|
|
|
TP_PM_GROUTINGDAILYDETAIL TPGD
|
|
|
LEFT JOIN TP_PM_GlazetypeRecord TPGR ON TPGR.GROUTINGDAILYDETAILID = TPGD.GROUTINGDAILYDETAILID
|
|
|
@@ -243,18 +243,19 @@ public class index : IHttpHandler
|
|
|
LEFT JOIN TP_PC_PROCEDURE TPPC ON TPPD.PROCEDUREID = TPPC.PROCEDUREID
|
|
|
WHERE
|
|
|
( CASE WHEN
|
|
|
- ( SELECT COUNT( * ) FROM TP_PM_PRODUCTIONDATA TPPD LEFT JOIN TP_PC_PROCEDURE TPPC ON TPPD.PROCEDUREID = TPPC.PROCEDUREID WHERE TPPD.PROCEDUREID IN 35 AND TPPD.BARCODE = @BARCODE@ ) = 1 THEN 35
|
|
|
+ ( SELECT COUNT( * ) FROM TP_PM_PRODUCTIONDATA TPPD LEFT JOIN TP_PC_PROCEDURE TPPC ON TPPD.PROCEDUREID = TPPC.PROCEDUREID WHERE TPPD.PROCEDUREID IN 35 AND TPPD.BARCODE = @BARCODE@ ) > 1 THEN 35
|
|
|
ELSE 13 END
|
|
|
) = TPPD.PROCEDUREID
|
|
|
AND TPGD.VALUEFLAG = 1
|
|
|
AND TMDC.DICTIONARYTYPE = 'TPC002'
|
|
|
AND TPGD.BARCODE = @BARCODE@
|
|
|
- ORDER BY TPGR.CREATETIME DESC) T
|
|
|
+ ORDER BY TPPD.CREATETIME DESC
|
|
|
+ ) T
|
|
|
LEFT JOIN TP_MST_GOODSKINGDEECODE TMGK ON T.GOODSCODE = TMGK.GOODSCODE
|
|
|
AND T.DICTIONARYVALUE = TMGK.GLAZETYPE
|
|
|
AND T.LOGONAME = TMGK.LOGONAME
|
|
|
LEFT JOIN TP_MST_GOODSLEVEL TMGL ON TMGL.GOODSLEVELID = T.GOODSLEVELID
|
|
|
- ORDER BY T.GOODSLEVELID,T.CREATETIME DESC",
|
|
|
+ ORDER BY T.CREATETIME DESC",
|
|
|
new CDAParameter("BARCODE", barCode)
|
|
|
);
|
|
|
|