|
|
@@ -3730,13 +3730,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
try
|
|
|
{
|
|
|
con.Open();
|
|
|
- string sqlString = @"SELECT
|
|
|
- *
|
|
|
- FROM(
|
|
|
- SELECT DISTINCT
|
|
|
- M.ENTRUCKINGCODE,
|
|
|
- I.GOODSCODE,
|
|
|
- I.GOODSNAME,
|
|
|
+ string sqlString = @"SELECT *
|
|
|
+ FROM(
|
|
|
+ SELECT DISTINCT
|
|
|
+ M.ENTRUCKINGCODE,
|
|
|
+ I.GOODSCODE,
|
|
|
+ I.GOODSNAME,
|
|
|
C.CUSTOMERCODE,
|
|
|
C.CUSTOMERNAME,
|
|
|
GT.GOODSTYPECODE
|
|
|
@@ -3747,10 +3746,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
INNER JOIN TP_MST_GOODS gs on gs.goodsID=I.GOODSID
|
|
|
LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID=GS.GOODSTYPEID
|
|
|
WHERE M.ENTRUCKINGCODE =:ENTRUCKINGCODE
|
|
|
- AND M.VALUEFLAG = '1'
|
|
|
- ORDER BY GOODSTYPECODE ASC
|
|
|
+ AND GT.GOODSTYPECODE<>'001002001'
|
|
|
+ AND M.VALUEFLAG = '1'
|
|
|
+ ORDER BY SUBSTR( GT.GOODSTYPECODE, 6) ASC
|
|
|
)
|
|
|
- WHERE ROWNUM=1";
|
|
|
+ ORDER BY SUBSTR( GOODSTYPECODE, 6) ASC";
|
|
|
OracleParameter[] paras = new OracleParameter[] {
|
|
|
new OracleParameter(":ENTRUCKINGCODE",OracleDbType.Varchar2,entruckingCode,ParameterDirection.Input),
|
|
|
};
|