增加养水标识识别

HG5000.3/PLC_S/Core/PLC_S_Core.cs

@@ -189,6 +189,9 @@ namespace PLC_S
         public string PLC_GOODSBREAK_CODE; //产品补裂
         public string PLC_GOODSBREAK_CODENUM;
 
+        public string PLC_GOODSWATER_CODE; //产品养水
+        public string PLC_GOODSWATER_CODENUM;
+
         public string PLC_SEMIREWORK_CODE; //半检返工
         public string PLC_SEMIREWORK_CODENUM;
 

HG5000.3/PLC_S/ServerModel/GoodsAuto.cs

@@ -308,6 +308,20 @@ namespace PLC_S.ServerModel
                     }
                     #endregion
 
+                    #region 【可选】养水标识（用于三水厂） 2024-01-29
+                    if (!string.IsNullOrEmpty(plc_s.PLC_GOODSWATER_CODE) && !string.IsNullOrEmpty(plc_s.PLC_GOODSWATER_CODENUM))
+                    {
+                        Int16 goodsWater = Convert.ToInt16(GetGoodsWater(barCode, e, logKeyT));
+                        outputMessage = $"[{e.Content}]SET_GoodsWater=[{goodsWater}]{plc_s.PLC_GOODSWATER_CODE + plc_s.PLC_GOODSWATER_CODENUM}";
+                        Logger.Trace(outputMessage, logKeyT, logger_t);
+                        FormLogShow?.ShowLog(outputMessage);
+                        p_r = plc?.Write<short>(plc_s.PLC_GOODSWATER_CODE, plc_s.PLC_GOODSWATER_CODENUM, goodsWater);
+                        outputMessage = $"[{e.Content}]END_GoodsWater=[{p_r.ToString()}]{plc_s.PLC_GOODSWATER_CODE + plc_s.PLC_GOODSWATER_CODENUM}";
+                        Logger.Trace(outputMessage, logKeyT, logger_t);
+                        FormLogShow?.ShowLog(outputMessage);
+                    }
+                    #endregion
+
                     #region 【可选】产品型号#物料号写入(用于三水厂) 2023-05-19
                     if (!string.IsNullOrEmpty(plc_s.PLC_GOODSCODESKU_CODE) && !string.IsNullOrEmpty(plc_s.PLC_GOODSCODESKU_CODENUM))
                     {
@@ -738,6 +752,34 @@ namespace PLC_S.ServerModel
             }
         }
 
+        private string GetGoodsWater(string barCode, ReceiveSession e, string loggerName)
+        {
+            try
+            {
+                using (IDataAccess conn = PLC_S_DataAccess.GetDataAccess(e))
+                {
+                    //取养水标识
+                    string sqlStr = @"
+                        SELECT
+	                        NVL( GDD.LEAKFLAG4, 0 )  AS WATER
+                        FROM
+	                        TP_PM_GROUTINGDAILYDETAIL GDD 
+                        WHERE
+	                        GDD.BARCODE = :BARCODE --'10016123244'
+                        ";
+                    string goodsWater = conn.ExecuteScalar(sqlStr, new CDAParameter(":BARCODE", barCode)).ToString();
+                    return goodsWater;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                Logger.Error(ex, $"[{e.Content}]ERROR-GetGoodsWater", loggerName, logger_e);
+                FormLogShow?.ShowLog($"[{e.Content}]ERROR-GetGoodsWater={ex.Message}");
+                return "0";
+            }
+        }
+
         private string GetGoodsCodeSku(string barCode, ReceiveSession e, string loggerName)
         {
             try
@@ -1033,6 +1075,9 @@ namespace PLC_S.ServerModel
                     plc_s.PLC_GOODSLEAKFLAG1_CODE = ini.Read(flag, "PLC_GOODSLEAKFLAG1_CODE");
                     plc_s.PLC_GOODSLEAKFLAG1_CODENUM = ini.Read(flag, "PLC_GOODSLEAKFLAG1_CODENUM");
 
+                    plc_s.PLC_GOODSWATER_CODE = ini.Read(flag, "PLC_GOODSWATER_CODE");
+                    plc_s.PLC_GOODSWATER_CODENUM = ini.Read(flag, "PLC_GOODSWATER_CODENUM");
+
                     plc_s.PROCEDURE_ID = ini.Read(flag, "PROCEDURE_ID");
                     plc_s.PROCEDURE_USERCODE = ini.Read(flag, "PROCEDURE_USERCODE");