|
|
@@ -166,12 +166,12 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
TMCM.PLATELIMITNUM1,
|
|
|
TMCM.PLATELIMITNUM2,
|
|
|
TMCM.COMMONFLAG,
|
|
|
- TMCM.EFFECTIVETIME,
|
|
|
- TMCM.ENDTIME
|
|
|
+ CASE WHEN TO_CHAR(TMCM.EFFECTIVETIME,'yyyy') = '2000' THEN NULL ELSE TMCM.EFFECTIVETIME END EFFECTIVETIME,
|
|
|
+ CASE WHEN TO_CHAR(TMCM.ENDTIME,'yyyy') = '2099' THEN NULL ELSE TMCM.ENDTIME END ENDTIME
|
|
|
FROM TP_MST_COMMONMODEL TMCM
|
|
|
LEFT JOIN TP_MST_LOGO TML ON TMCM.LOGOID = TML.LOGOID
|
|
|
WHERE
|
|
|
- TMCM.VALUEFLAG = '1'
|
|
|
+ TMCM.VALUEFLAG = '1'
|
|
|
AND TMCM.ACCOUNTID = @ACCOUNTID@
|
|
|
";
|
|
|
List<CDAParameter> sqlPara = new List<CDAParameter>();
|
|
|
@@ -231,9 +231,9 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
DataTable dt = conn.ExecuteDatatable(@"
|
|
|
- SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSID = @GOODSID@
|
|
|
+ SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@
|
|
|
",
|
|
|
- new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"])
|
|
|
+ new CDAParameter("GOODSCODE", HttpContext.Current.Request["goodsid"])
|
|
|
);
|
|
|
string jsonStr = new JsonResult(dt).ToJson();
|
|
|
return jsonStr;
|
|
|
@@ -262,7 +262,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
FROM
|
|
|
TP_MST_GOODSLOGOSAP SAP
|
|
|
WHERE
|
|
|
- GOODSID = @GOODSID@
|
|
|
+ GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@)
|
|
|
AND LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGONAME@)
|
|
|
UNION
|
|
|
SELECT
|
|
|
@@ -276,7 +276,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
FROM
|
|
|
TP_MST_GOODS G
|
|
|
WHERE
|
|
|
- GOODSID = @GOODSID@
|
|
|
+ GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@)
|
|
|
AND LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGONAME@)
|
|
|
ORDER BY
|
|
|
GOODSCODE,
|
|
|
@@ -287,7 +287,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
ORDER BY
|
|
|
id DESC
|
|
|
",
|
|
|
- new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"]),
|
|
|
+ new CDAParameter("GOODSCODE", HttpContext.Current.Request["goodsid"]),
|
|
|
new CDAParameter("LOGONAME", HttpContext.Current.Request["logoid"])
|
|
|
);
|
|
|
string jsonStr = new JsonResult(dt).ToJson();
|
|
|
@@ -334,8 +334,8 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
/// <returns>json</returns>
|
|
|
private string insert(NameValueCollection form)
|
|
|
{
|
|
|
- var EFFECTIVETIME = "";
|
|
|
- var ENDTIME = "";
|
|
|
+ var EFFECTIVETIME = "";
|
|
|
+ var ENDTIME = "";
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
//判断是否存在
|
|
|
@@ -361,10 +361,18 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
{
|
|
|
EFFECTIVETIME = "2000-01-01";
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ EFFECTIVETIME = form["EFFECTIVETIME"];
|
|
|
+ }
|
|
|
if (form["ENDTIME"] == "")
|
|
|
{
|
|
|
ENDTIME = "2099-12-31";
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ENDTIME = form["ENDTIME"];
|
|
|
+ }
|
|
|
result = conn.ExecuteNonQuery(@"
|
|
|
INSERT INTO TP_MST_COMMONMODEL
|
|
|
(GOODSCODE,GOODSID,LOGOID,OUTLETDISTANCE,MATERIALCODE,PLATELIMITNUM1,PLATELIMITNUM2,COMMONFLAG,EFFECTIVETIME,ENDTIME,CREATEUSERID,UPDATEUSERID,ACCOUNTID)
|
|
|
@@ -419,18 +427,37 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
/// <returns>json</returns>
|
|
|
private string update(NameValueCollection form)
|
|
|
{
|
|
|
+ var EFFECTIVETIME = "";
|
|
|
+ var ENDTIME = "";
|
|
|
using (IDataAccess conn = DataAccess.Create())
|
|
|
{
|
|
|
+ if (form["EFFECTIVETIME"] == "")
|
|
|
+ {
|
|
|
+ EFFECTIVETIME = "2000-01-01";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ EFFECTIVETIME = form["EFFECTIVETIME"];
|
|
|
+ }
|
|
|
+ if (form["ENDTIME"] == "")
|
|
|
+ {
|
|
|
+ ENDTIME = "2099-12-31";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ENDTIME = form["ENDTIME"];
|
|
|
+ }
|
|
|
int result = conn.ExecuteNonQuery(@"
|
|
|
UPDATE TP_MST_COMMONMODEL
|
|
|
SET
|
|
|
- GOODSCODE = (SELECT GOODSCODE FROM TP_MST_GOODS WHERE GOODSID = @GOODSCODE@),
|
|
|
- GOODSID = @GOODSCODE@,
|
|
|
- LOGOID = @LOGOID@,
|
|
|
+ GOODSCODE = @GOODSCODE@,
|
|
|
+ GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@),
|
|
|
+ LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGOID@),
|
|
|
OUTLETDISTANCE = @OUTLETDISTANCE@,
|
|
|
MATERIALCODE = @MATERIALCODE@,
|
|
|
PLATELIMITNUM1 = @PLATELIMITNUM1@,
|
|
|
PLATELIMITNUM2 = @PLATELIMITNUM2@,
|
|
|
+ COMMONFLAG = @COMMONFLAG@,
|
|
|
EFFECTIVETIME = @EFFECTIVETIME@,
|
|
|
ENDTIME = @ENDTIME@,
|
|
|
UPDATEUSERID = @UPDATEUSERID@,
|
|
|
@@ -442,11 +469,11 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
|
|
|
new CDAParameter("LOGOID", form["LOGONAME"]),
|
|
|
new CDAParameter("OUTLETDISTANCE", form["OUTLETDISTANCE"]),
|
|
|
new CDAParameter("MATERIALCODE", form["MATERIALCODE"]),
|
|
|
- new CDAParameter("ORGANIZATIONID", form["ORGANIZATIONID"]),
|
|
|
new CDAParameter("PLATELIMITNUM1", form["PLATELIMITNUM1"]),
|
|
|
new CDAParameter("PLATELIMITNUM2", form["PLATELIMITNUM2"]),
|
|
|
- new CDAParameter("EFFECTIVETIME", form["EFFECTIVETIME"], DataType.DateTime),
|
|
|
- new CDAParameter("ENDTIME", form["ENDTIME"], DataType.DateTime),
|
|
|
+ new CDAParameter("COMMONFLAG", form["COMMONFLAG"]),
|
|
|
+ new CDAParameter("EFFECTIVETIME", EFFECTIVETIME, DataType.DateTime),
|
|
|
+ new CDAParameter("ENDTIME", ENDTIME, DataType.DateTime),
|
|
|
new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"]),
|
|
|
new CDAParameter("COMMONGOODSID", HttpContext.Current.Request["id"])
|
|
|
);
|
ztl