处理中兴外箱规则

UAS_MES_HYSX/FunctionCode/Packing/Packing_PackageCollectionZX.cs

@@ -268,7 +268,11 @@ namespace UAS_MES_NEW.Packing
             {
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode from makeserial where ms_sncode ='" + sn_code.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode from makeserial where ms_sncode ='" + sn_code.Text + "' or ms_code='" + sn_code.Text + "' order by ms_id desc", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
+                    }
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {
                         if (oMsID == "" || oMsID == "null" || oMsID == "0")

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -457,14 +457,26 @@ namespace UAS_MES_NEW.PublicMethod
         {
             dynamic obj = new ExpandoObject();
             var expandoDict = obj as IDictionary<string, object>;
-            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(NOTYPE,0)NOTYPE,po_sn,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join ZTE_ORDER on ma_custpo=BATCH_NO  where pd_outboxcode='" + iBox + "' and  RESERVE9='" + User.UserLineCode + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ZD_D_SN,nvl(NOTYPE,0)NOTYPE,po_sn,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join ZTE_ORDER on ma_custpo=BATCH_NO  where pd_outboxcode='" + iBox + "' and  RESERVE9='" + User.UserLineCode + "'", "select");
             string makecode = "";
             string po = "";
             int notype = 0;
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 string enNoKey = $"en_no{i}";
-                string enNoValue = dt.Rows[i]["ZD_DEV_EN_NO"].ToString();
+                string enNoValue = "";
+                if (int.Parse(dt.Rows[i]["NOTYPE"].ToString()) == 0)
+                {
+                    enNoValue = dt.Rows[i]["ZD_DEV_EN_NO"].ToString();
+                }
+                else if (int.Parse(dt.Rows[i]["NOTYPE"].ToString()) == 4)
+                {
+                    enNoValue = dt.Rows[i]["ZD_D_SN"].ToString();
+                }
+                else
+                {
+                    enNoValue = dt.Rows[i]["ZD_DEV_EN_NO"].ToString();
+                }
                 expandoDict[enNoKey] = enNoValue;
                 makecode = dt.Rows[i]["pd_makecode"].ToString();
                 po = dt.Rows[i]["po_sn"].ToString();
@@ -725,7 +737,7 @@ namespace UAS_MES_NEW.PublicMethod
                         "insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE) " +
                         "values(EISDATA_seq.nextval,'" + json.Replace("'", "''") + "',sysdate,'SendPowerCode')",
                         "insert")
-                    ) ;
+                    );
                 dh.ExecuteSql("update craftmaterial set cm_ifupload=-1 where cm_sncode='" + iSN + "'", "update");
                 // 异步发送请求（假设ToServerReq可以被异步化）
                 string returnstr = await ToServerReqAsync(json); // 需要实现异步版本
@@ -1140,10 +1152,10 @@ namespace UAS_MES_NEW.PublicMethod
                 {
                     clientSocket.Connect(new IPEndPoint(ip, SN_SERVICE_PORT));
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     nRet = -13;
-                    dh.ExecuteSql("insert into getdataerror(id,err,datetime)values(getdataerror_seq.nextval,'"+ex.Message+ex.StackTrace+"',sysdate)", "insert");
+                    dh.ExecuteSql("insert into getdataerror(id,err,datetime)values(getdataerror_seq.nextval,'" + ex.Message + ex.StackTrace + "',sysdate)", "insert");
                     break;
                 }
                 try
@@ -1157,7 +1169,7 @@ namespace UAS_MES_NEW.PublicMethod
                     Array.Copy(bytJson, 0, bytBuf, FACT_DATA_HEAD.MY_LEN, bytJson.Length);
                     clientSocket.Send(bytBuf);
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     nRet = -12;
                     dh.ExecuteSql("insert into getdataerror(id,err,datetime)values(getdataerror_seq.nextval,'" + ex.Message + ex.StackTrace + "',sysdate)", "insert");