|
|
@@ -145,10 +145,45 @@ public class wmslog : IHttpHandler, IReadOnlySessionState
|
|
|
string SERIALNO = context.Request["SERIALNO"];
|
|
|
// 东科码
|
|
|
string codei = context.Request["codei"];
|
|
|
+ //条码单选框
|
|
|
+ string code = context.Request["code"];
|
|
|
|
|
|
List<CDAParameter> sqlPara = new List<CDAParameter>();
|
|
|
|
|
|
- string sqlStr = @"
|
|
|
+ string sqlStr = "";
|
|
|
+ if(code != null && codei != ""){
|
|
|
+ sqlStr = @"
|
|
|
+ SELECT tt.sku 物料编码
|
|
|
+ ,tt.serialno 外箱码
|
|
|
+ ,tt.codei 东科码
|
|
|
+ ,tt.serialno 唯一码
|
|
|
+ ,tt.lpn 装板码
|
|
|
+ ,tt.udf1 销售单号
|
|
|
+ ,1 入库数量
|
|
|
+ ,'PCS' 单位
|
|
|
+ ,tt.logid
|
|
|
+ ,td.charg AS 生产入库单号
|
|
|
+ FROM tp_wms_log tt
|
|
|
+ INNER JOIN (SELECT t.workcode || to_char(t.begintime, 'yyMM') || t.workcode || 'E' ||
|
|
|
+ to_char(t.logid, 'FM0000000000') AS charg
|
|
|
+ ,t.logid
|
|
|
+ FROM tsap_hegii_datalog_bg t
|
|
|
+ WHERE t.logtype = 2
|
|
|
+ AND t.datacode = '60'
|
|
|
+ AND t.datastuts IN ('S', 'E')) td ON td.logid = tt.bglogid WHERE td.charg = (
|
|
|
+ SELECT td.charg AS 生产入库单号
|
|
|
+ FROM tp_wms_log tt
|
|
|
+ INNER JOIN (SELECT t.workcode || to_char(t.begintime, 'yyMM') || t.workcode || 'E' ||
|
|
|
+ to_char(t.logid, 'FM0000000000') AS charg
|
|
|
+ ,t.logid
|
|
|
+ FROM tsap_hegii_datalog_bg t
|
|
|
+ WHERE t.logtype = 2
|
|
|
+ AND t.datacode = '60'
|
|
|
+ AND t.datastuts IN ('S', 'E')";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sqlStr = @"
|
|
|
SELECT tt.sku 物料编码
|
|
|
,tt.serialno 外箱码
|
|
|
,tt.codei 东科码
|
|
|
@@ -167,6 +202,7 @@ public class wmslog : IHttpHandler, IReadOnlySessionState
|
|
|
WHERE t.logtype = 2
|
|
|
AND t.datacode = '60'
|
|
|
AND t.datastuts IN ('S', 'E')";
|
|
|
+ }
|
|
|
|
|
|
//如果入库单号不为空，取消时间查询条件 add 夏常明 2023-8-23
|
|
|
if (!string.IsNullOrEmpty(charg))
|
|
|
@@ -204,7 +240,14 @@ public class wmslog : IHttpHandler, IReadOnlySessionState
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(codei) && string.IsNullOrEmpty(bglogid))
|
|
|
{
|
|
|
- sqlStr += " and tt.codei like '%" + codei + "%'";
|
|
|
+ if (code != null)
|
|
|
+ {
|
|
|
+ sqlStr += " and tt.codei like '%" + codei + "%')";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sqlStr += " and tt.codei like '%" + codei + "%'";
|
|
|
+ }
|
|
|
}
|
|
|
sqlStr += " ORDER BY tt.serialno";
|
|
|
|
ztl