|
|
@@ -193,14 +193,14 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
SELECT
|
|
|
GDD.BARCODE,
|
|
|
G.GOODSCODE,
|
|
|
- P.PROCEDURENAME,
|
|
|
- U.USERCODE
|
|
|
+ DECODE(P.PROCEDURENAME,NULL,'成型'，P.PROCEDURENAME) PROCEDURENAME,
|
|
|
+ DECODE(U.USERCODE,NULL,GDD.USERCODE，U.USERCODE) USERCODE
|
|
|
FROM
|
|
|
TP_PM_GROUTINGDAILYDETAIL GDD
|
|
|
- INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = GDD.BARCODE
|
|
|
- INNER JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
- INNER JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
- INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
|
|
|
+ LEFT JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = GDD.BARCODE
|
|
|
+ LEFT JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
+ LEFT JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
+ LEFT JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
|
|
|
WHERE
|
|
|
GDD.BARCODE = '{barCode}'";
|
|
|
dt = conn.GetSqlResultToDt(sqlStr);
|
|
|
@@ -289,7 +289,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
'{barcodeStr[i]}',
|
|
|
'{batch}',
|
|
|
1,
|
|
|
- {procedureid},
|
|
|
+ '{procedureid}',
|
|
|
'',
|
|
|
'{sUser.AccountID}',
|
|
|
USERID,
|
|
|
@@ -392,17 +392,17 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
TD.ENTRUCKINGCODE,
|
|
|
TD.BARCODE,
|
|
|
G.GOODSCODE,
|
|
|
- U.USERCODE,
|
|
|
- P.PROCEDURENAME,
|
|
|
+ DECODE(U.USERCODE,NULL,GDD.USERCODE,U.USERCODE) USERCODE,
|
|
|
+ DECODE(P.PROCEDURENAME,NULL,'成型',P.PROCEDURENAME) PROCEDURENAME,
|
|
|
TD.DOFUNCTION
|
|
|
FROM
|
|
|
TP_PM_ENTRUCKINGDETAIL TD
|
|
|
INNER JOIN TP_PM_ENTRUCKING T ON T.ENTRUCKINGCODE = TD.ENTRUCKINGCODE
|
|
|
AND T.BATCH = TD.BATCH
|
|
|
INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.BARCODE = TD.BARCODE
|
|
|
- INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
- INNER JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
- INNER JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
+ LEFT JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
+ LEFT JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
+ LEFT JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
|
|
|
WHERE
|
|
|
TD.ENTRUCKINGCODE = '{entruckingCode}'
|
|
|
@@ -592,10 +592,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
select PROCEDUREID from TP_PM_INPRODUCTION where barcode = '{barCode}'
|
|
|
";
|
|
|
string procedureid = conn.GetSqlResultToStr(sqlStr);
|
|
|
- if (!string.IsNullOrEmpty(procedureid))
|
|
|
- {
|
|
|
- //插入装具明细
|
|
|
- sqlStr = $@"
|
|
|
+ //插入装具明细
|
|
|
+ sqlStr = $@"
|
|
|
INSERT INTO TP_PM_EntruckingDetail (
|
|
|
ENTRUCKINGCODE,
|
|
|
BARCODE,
|
|
|
@@ -614,7 +612,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
'{barCode}',
|
|
|
'{batch}',
|
|
|
3,
|
|
|
- {procedureid},
|
|
|
+ '{procedureid}',
|
|
|
'',
|
|
|
'{sUser.AccountID}',
|
|
|
USERID,
|
|
|
@@ -624,17 +622,11 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
'{sUser.UserID}'
|
|
|
FROM TP_MST_USER WHERE USERCODE = '{currentUserCode}'
|
|
|
";
|
|
|
- execute = conn.ExecuteNonQuery(sqlStr);
|
|
|
- if (execute > 0)
|
|
|
- {
|
|
|
- sre.Status = Constant.ServiceResultStatus.Success;
|
|
|
- sre.Message = "操作完成！";
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- sre.Status = Constant.ServiceResultStatus.NoModifyData;
|
|
|
- sre.Message = "操作失败，没有更新任何数据！";
|
|
|
- }
|
|
|
+ execute = conn.ExecuteNonQuery(sqlStr);
|
|
|
+ if (execute > 0)
|
|
|
+ {
|
|
|
+ sre.Status = Constant.ServiceResultStatus.Success;
|
|
|
+ sre.Message = "操作完成！";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -727,7 +719,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
FROM
|
|
|
TP_PM_ENTRUCKINGDETAIL TD
|
|
|
INNER JOIN TP_PM_ENTRUCKING T ON T.ENTRUCKINGCODE = TD.ENTRUCKINGCODE AND T.BATCH = TD.BATCH
|
|
|
- INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
+ LEFT JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
INNER JOIN TP_MST_USER CU ON CU.USERCODE = '{currentUserCode}' AND CU.VALUEFLAG = '1'
|
|
|
WHERE
|
|
|
TD.ENTRUCKINGCODE = '{entruckingCode}'
|
|
|
@@ -751,17 +743,17 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
TD.ENTRUCKINGCODE,
|
|
|
TD.BARCODE,
|
|
|
G.GOODSCODE,
|
|
|
- U.USERCODE,
|
|
|
- P.PROCEDURENAME,
|
|
|
+ DECODE(U.USERCODE,NULL,GDD.USERCODE,U.USERCODE) USERCODE,
|
|
|
+ DECODE(P.PROCEDURENAME,NULL,'成型',P.PROCEDURENAME) PROCEDURENAME,
|
|
|
TD.DOFUNCTION
|
|
|
FROM
|
|
|
TP_PM_ENTRUCKINGDETAIL TD
|
|
|
INNER JOIN TP_PM_ENTRUCKING T ON T.ENTRUCKINGCODE = TD.ENTRUCKINGCODE
|
|
|
AND T.BATCH = TD.BATCH
|
|
|
INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.BARCODE = TD.BARCODE
|
|
|
- INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
- INNER JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
- INNER JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
+ LEFT JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
|
|
|
+ LEFT JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
+ LEFT JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
|
|
|
WHERE
|
|
|
TD.ENTRUCKINGCODE = '{entruckingCode}'
|
|
|
@@ -856,13 +848,13 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
SELECT
|
|
|
GDD.BARCODE,
|
|
|
G.GOODSCODE,
|
|
|
- P.PROCEDURENAME,
|
|
|
- U.USERCODE
|
|
|
+ DECODE(U.USERCODE,NULL,GDD.USERCODE,U.USERCODE) USERCODE,
|
|
|
+ DECODE(P.PROCEDURENAME,NULL,'成型',P.PROCEDURENAME) PROCEDURENAME
|
|
|
FROM
|
|
|
TP_PM_GROUTINGDAILYDETAIL GDD
|
|
|
- INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = GDD.BARCODE
|
|
|
- INNER JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
- INNER JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
+ LEFT JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = GDD.BARCODE
|
|
|
+ LEFT JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
|
|
|
+ LEFT JOIN TP_MST_USER U ON U.USERID = IP.USERID
|
|
|
INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
|
|
|
WHERE
|
|
|
GDD.BARCODE = '{barCode}'";
|
feiyue