修改彩盒打印

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrintZX.cs

@@ -213,7 +213,7 @@ namespace UAS_MES_NEW.Make
                         if (dt.Rows.Count > 0)
                         {
                             PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sncode.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
-                            if (PR_CHECKCARTONW != "0")
+                            if (PR_CHECKCARTONW != "0"&& PR_CHECKCARTONW!="")
                             {
                                 OperateResult.AppendText(">>彩盒" + sncode.Text + "当前处于称重工序，无法在此界面采集，需去彩盒称重界面进行采集\n", Color.Black, sncode);
                                 return;

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -340,7 +340,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒机身标'", "delete");
             }
-            dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
+            //dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
             dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode)" +
                 "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "')", "insert");
             return dev_en_no;
@@ -524,9 +524,9 @@ namespace UAS_MES_NEW.PublicMethod
                     "'" + deviceInfo.Voltage + "','" + deviceInfo.Power + "','" + deviceInfo.OrderNo + "','" + deviceInfo.BigBoxNo + "','" + deviceInfo.DSN[i] + "'," +
                     "'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate)", "insert");
             }
-            if (returnstr.Length > 4000)
+            if (returnstr.Length > 1000)
             {
-                returnstr = returnstr.Substring(0, 3999);
+                returnstr = returnstr.Substring(0, 1000);
             }
             dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetOutBoxInfo')", "insert");
         }
@@ -556,12 +556,11 @@ namespace UAS_MES_NEW.PublicMethod
             dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'GetPalletInfo')", "insert");
 
             string returnstr = ToServerReq(json);
-            if (returnstr.Length > 4000)
+            if (returnstr.Length > 1000)
             {
-                returnstr = returnstr.Substring(0, 3999);
+                returnstr = returnstr.Substring(0, 1000);
             }
             dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetPalletInfo')", "insert");
-
         }
 
         public static void GetMingPai_Thailand(string iSN)