|
|
@@ -34,7 +34,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
b.btnSearch = true;
|
|
|
b.btnDetail = true;
|
|
|
b.btnCheckbox = true;
|
|
|
- b.btnExport = false;
|
|
|
+ b.btnExport = true;
|
|
|
b.btnReload = true;
|
|
|
};
|
|
|
switch (context.Request["m"].ToString().ToLower())
|
|
|
@@ -125,6 +125,11 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
context.Response.Write(getPLATELIMITNUM());
|
|
|
break;
|
|
|
}
|
|
|
+ case "lo":
|
|
|
+ {
|
|
|
+ context.Response.Write(getLogo());
|
|
|
+ break;
|
|
|
+ }
|
|
|
default:
|
|
|
{
|
|
|
break;
|
|
|
@@ -187,25 +192,59 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private string getOUTLETDISTANCE()
|
|
|
+ private string getLogo()
|
|
|
{
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
- DataTable dt = conn.ExecuteDatatable(@"
|
|
|
- SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSID = @GOODSID@
|
|
|
+ DataTable dt = conn.ExecuteDatatable(@"
|
|
|
+ SELECT
|
|
|
+ DISTINCT
|
|
|
+ T.LOGOID LOGOID,
|
|
|
+ T.LOGONAME LOGONAME
|
|
|
+ FROM(
|
|
|
+ SELECT
|
|
|
+ G.LOGOID,
|
|
|
+ TML.LOGONAME
|
|
|
+ FROM
|
|
|
+ TP_MST_GOODS G
|
|
|
+ LEFT JOIN TP_MST_LOGO TML ON G.LOGOID = TML.LOGOID
|
|
|
+ WHERE
|
|
|
+ G.GOODSID = @GOODSID@ UNION ALL
|
|
|
+ SELECT
|
|
|
+ GLS.LOGOID,
|
|
|
+ L.LOGONAME
|
|
|
+ FROM
|
|
|
+ TP_MST_GOODSLOGOSAP GLS
|
|
|
+ INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID
|
|
|
+ WHERE
|
|
|
+ GLS.GOODSID = @GOODSID@
|
|
|
+ ) T
|
|
|
",
|
|
|
new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"])
|
|
|
);
|
|
|
- string jsonStr = new JsonResult(dt).ToJson();
|
|
|
- return jsonStr;
|
|
|
+ return new JsonResult(dt).ToJson();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private string getOUTLETDISTANCE()
|
|
|
+ {
|
|
|
+ using (IDataAccess conn = DataAccess.Create())
|
|
|
+ {
|
|
|
+ DataTable dt = conn.ExecuteDatatable(@"
|
|
|
+ SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSID = @GOODSID@
|
|
|
+ ",
|
|
|
+ new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"])
|
|
|
+ );
|
|
|
+ string jsonStr = new JsonResult(dt).ToJson();
|
|
|
+ return jsonStr;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private string getPLATELIMITNUM()
|
|
|
+ private string getPLATELIMITNUM()
|
|
|
{
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
- DataTable dt = conn.ExecuteDatatable(@"
|
|
|
+ DataTable dt = conn.ExecuteDatatable(@"
|
|
|
SELECT
|
|
|
PLATELIMITNUM,
|
|
|
PLATELIMITNUMNEW,
|
|
|
@@ -248,11 +287,11 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
ORDER BY
|
|
|
id DESC
|
|
|
",
|
|
|
- new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"]),
|
|
|
- new CDAParameter("LOGONAME", HttpContext.Current.Request["logoid"])
|
|
|
- );
|
|
|
- string jsonStr = new JsonResult(dt).ToJson();
|
|
|
- return jsonStr;
|
|
|
+ new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"]),
|
|
|
+ new CDAParameter("LOGONAME", HttpContext.Current.Request["logoid"])
|
|
|
+ );
|
|
|
+ string jsonStr = new JsonResult(dt).ToJson();
|
|
|
+ return jsonStr;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -295,6 +334,8 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
/// <returns>json</returns>
|
|
|
private string insert(NameValueCollection form)
|
|
|
{
|
|
|
+ var EFFECTIVETIME = "";
|
|
|
+ var ENDTIME = "";
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
//判断是否存在
|
|
|
@@ -316,6 +357,14 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
if (count == "0")
|
|
|
{
|
|
|
int result = 0;
|
|
|
+ if (form["EFFECTIVETIME"] == "")
|
|
|
+ {
|
|
|
+ EFFECTIVETIME = "2000-01-01";
|
|
|
+ }
|
|
|
+ if (form["ENDTIME"] == "")
|
|
|
+ {
|
|
|
+ ENDTIME = "2099-12-31";
|
|
|
+ }
|
|
|
result = conn.ExecuteNonQuery(@"
|
|
|
INSERT INTO TP_MST_COMMONMODEL
|
|
|
(GOODSCODE,GOODSID,LOGOID,OUTLETDISTANCE,MATERIALCODE,PLATELIMITNUM1,PLATELIMITNUM2,COMMONFLAG,EFFECTIVETIME,ENDTIME,CREATEUSERID,UPDATEUSERID,ACCOUNTID)
|
|
|
@@ -342,8 +391,8 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
new CDAParameter("PLATELIMITNUM1", form["PLATELIMITNUM1"]),
|
|
|
new CDAParameter("PLATELIMITNUM2", form["PLATELIMITNUM2"]),
|
|
|
new CDAParameter("COMMONFLAG", form["COMMONFLAG"]),
|
|
|
- new CDAParameter("EFFECTIVETIME", form["EFFECTIVETIME"], DataType.DateTime),
|
|
|
- new CDAParameter("ENDTIME", form["ENDTIME"], DataType.DateTime),
|
|
|
+ new CDAParameter("EFFECTIVETIME", EFFECTIVETIME, DataType.DateTime),
|
|
|
+ new CDAParameter("ENDTIME", ENDTIME, DataType.DateTime),
|
|
|
new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
|
|
|
new CDAParameter("CREATEUSERID", HttpContext.Current.Session["userId"]),
|
|
|
new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"])
|
ztl