|
|
@@ -204,6 +204,8 @@ public class index : IHttpHandler
|
|
|
T.LOGONAME,
|
|
|
T.BUILDINGNO,
|
|
|
T.GOODSLEVELNAME,
|
|
|
+ T.CHECKTIME,
|
|
|
+
|
|
|
TMGK.KingdeeCode
|
|
|
FROM (
|
|
|
SELECT DISTINCT
|
|
|
@@ -213,9 +215,10 @@ public class index : IHttpHandler
|
|
|
TMG.GOODSMODEL,
|
|
|
TMGT.GOODSTYPENAME,
|
|
|
CASE TMG.GOODS_LINE_TYPE WHEN 0 THEN '普通' ELSE '高压' END AS GOODS_LINE_TYPE,
|
|
|
- TMDC.DICTIONARYVALUE,
|
|
|
+ TMDC.DICTIONARYVALUE,TPPD.CHECKTIME,
|
|
|
1 AS PLATELIMITNUM,
|
|
|
TML.LOGONAME,
|
|
|
+ row_number() over (partition by TPGD.GOODSNAME order by TPPD.CHECKTIME DESC) as rownums ,
|
|
|
(CASE WHEN TPPC.PROCEDUREID = 35 THEN '重烧'
|
|
|
WHEN TPPC.PROCEDUREID != 35 THEN ( CASE WHEN TPG.BUILDINGNO = '1#' THEN '一期'
|
|
|
WHEN TPG.BUILDINGNO = '2#' THEN '二期'
|
|
|
@@ -233,7 +236,7 @@ public class index : IHttpHandler
|
|
|
FROM TP_PM_GlazetypeRecord
|
|
|
WHERE GROUTINGDAILYDETAILID = (SELECT GROUTINGDAILYDETAILID
|
|
|
FROM TP_PM_GROUTINGDAILYDETAIL
|
|
|
- WHERE BARCODE = @BARCODE@)
|
|
|
+ WHERE BARCODE = @BARCODE@)
|
|
|
ORDER BY CREATETIME DESC) WHERE ROWNUM = 1
|
|
|
) TPGR ON TPGR.GROUTINGDAILYDETAILID = TPGD.GROUTINGDAILYDETAILID
|
|
|
LEFT JOIN TP_MST_GOODS TMG ON TPGD.GOODSID = TMG.GOODSID
|
|
|
@@ -251,16 +254,18 @@ public class index : IHttpHandler
|
|
|
TP_PM_PRODUCTIONDATA TPPD
|
|
|
LEFT JOIN TP_PC_PROCEDURE TPPC ON TPPD.PROCEDUREID = TPPC.PROCEDUREID
|
|
|
WHERE TPPD.PROCEDUREID = 35
|
|
|
- AND TPPD.BARCODE = @BARCODE@
|
|
|
+ AND TPPD.BARCODE = @BARCODE@
|
|
|
) = 1 THEN 35 ELSE TPPD.PROCEDUREID END
|
|
|
) = TPPD.PROCEDUREID
|
|
|
AND TPGD.VALUEFLAG = 1
|
|
|
AND TMDC.DICTIONARYTYPE = 'TPC002'
|
|
|
- AND TPPD.BARCODE = @BARCODE@
|
|
|
+ AND TPPD.BARCODE = @BARCODE@
|
|
|
) T
|
|
|
LEFT JOIN TP_MST_GOODSKINGDEECODE TMGK ON T.GOODSCODE = TMGK.GOODSCODE
|
|
|
AND T.DICTIONARYVALUE = TMGK.GLAZETYPE
|
|
|
AND T.LOGONAME = TMGK.LOGONAME
|
|
|
+ WHERE rownums=1
|
|
|
+ ORDER BY T.CHECKTIME DESC
|
|
|
",
|
|
|
new CDAParameter("BARCODE", barCode)
|
|
|
);
|