|
|
@@ -715,17 +715,17 @@ namespace PLC_S.ServerModel
|
|
|
{
|
|
|
using (IDataAccess conn = PLC_S_DataAccess.GetDataAccess(e))
|
|
|
{
|
|
|
+ //判断单品下线
|
|
|
string sqlStr = @"
|
|
|
SELECT
|
|
|
- OFFLINEFLAG
|
|
|
+ CASE WHEN GDD.OFFLINEFLAG = 0 AND OL.GOODSID IS NULL THEN 1 ELSE 2 END AS OFFLINEFLAG
|
|
|
FROM
|
|
|
TP_PM_GROUTINGDAILYDETAIL GDD
|
|
|
+ LEFT JOIN TP_PM_OFFLINE OL ON GDD.GOODSID = OL.GOODSID
|
|
|
WHERE
|
|
|
- GDD.BARCODE = :BARCODE
|
|
|
+ GDD.BARCODE = :BARCODE --'10017193389'
|
|
|
";
|
|
|
string goodsDisabled = conn.ExecuteScalar(sqlStr, new CDAParameter(":BARCODE", barCode)).ToString();
|
|
|
- if (goodsDisabled == "0") goodsDisabled = "1"; //正常
|
|
|
- if (goodsDisabled == "1") goodsDisabled = "2"; //下线
|
|
|
return goodsDisabled;
|
|
|
}
|
|
|
|
|
|
@@ -1020,6 +1020,9 @@ namespace PLC_S.ServerModel
|
|
|
|
|
|
plc_s.PLC_GOODSTYPE_CODE = ini.Read(flag, "PLC_GOODSTYPE_CODE");
|
|
|
plc_s.PLC_GOODSTYPE_CODENUM = ini.Read(flag, "PLC_GOODSTYPE_CODENUM");
|
|
|
+
|
|
|
+ plc_s.PLC_GOODSDISABLED_CODE = ini.Read(flag, "PLC_GOODSDISABLED_CODE");
|
|
|
+ plc_s.PLC_GOODSDISABLED_CODENUM = ini.Read(flag, "PLC_GOODSDISABLED_CODENUM");
|
|
|
|
|
|
plc_s.PLC_SEMIREWORK_CODE = ini.Read(flag, "PLC_SEMIREWORK_CODE");
|
|
|
plc_s.PLC_SEMIREWORK_CODENUM = ini.Read(flag, "PLC_SEMIREWORK_CODENUM");
|
xuwei