优化凯贝桌面端批量下推有的字段没有存入值，优化app条码拆码，增加app条码拆码获取打印数据

zrg

10 天以前 f1c107b1ae5f48f2c18c23568bf902c410b564f5

优化凯贝桌面端批量下推有的字段没有存入值，优化app条码拆码，增加app条码拆码获取打印数据

 PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.pdb

Binary files differ

 PayM/bin/x86/Debug/DAL.dll

Binary files differ

 PayM/bin/x86/Debug/DAL.pdb

Binary files differ

 PayM/bin/x86/Debug/DBUtility.dll

Binary files differ

 PayM/bin/x86/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/Model.dll

Binary files differ

 PayM/bin/x86/Debug/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/PayM.dll

Binary files differ

 PayM/bin/x86/Debug/PayM.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt

@@ -2478,7 +2478,6 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -1496,7 +1496,7 @@
                sql = "delete from Sc_StationOutBillSub_SN where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
                oCN.RunProc(sql);
                //反写工序出站单的合格数量
                oCN.RunProc("update Sc_StationOutBillMain WITH (TABLOCKX) set HQty-=1  where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");
                oCN.RunProc("update Sc_StationOutBillMain  set HQty-=1  where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");


                oCN.Commit();

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -2658,7 +2658,7 @@
                    string sql = "insert into Gy_BarCodeBill (HInterID, HEntryID, HBarCode, HBarCodeType, HBarCodeSubType, HMaterID, HUnitID, HQty, HBatchNo, HSupID, HGroupID, HMaker, HMakeDate, " +
                  "HPrintQty, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HinitQty, HEndQty, HBarcodeQtys, HBarcodeNo, HDeptID, HWhID, HSPID, HRemark, " +
                  "HCusID, HCusType, HEndDate, HWorkLineName, HBarCodeDate, HSTOCKORGID, HOWNERID, HSeOrderBillNo, HGiveAwayFlag, HMaterName, HMaterModel, " +
                  "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ" +
                  "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ,HSupMaterNumber,HSupBatchNo" +
                  ") values (" +
                  "'" + ds.Tables[0].Rows[0]["HInterID"].ToString() + "', " +
                  "'" + (int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1).ToString() + "', " +
@@ -2711,7 +2711,9 @@
                  "'" + ds.Tables[0].Rows[0]["HCusModel"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HCusMaterName"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HCheckEmpName"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "'" +
                  "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HSupBatchNo"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HSupMaterNumber"].ToString() + "'" +
                  ")";
                    //插入拆分条码
                    oCN.RunProc(sql);
@@ -2750,6 +2752,60 @@
        }
        #endregion

        #region [app æ¡ç æ‹†ç èŽ·å–拆码打印数据]
        [Route("Sc_BarCode/GetSplitBarCode_SubList")]
        [HttpGet]
        public object GetSplitBarCode_SubList(string HBarCodeNo)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(HBarCodeNo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请输入条码编号";
                    objJsonResult.data = null;
                    return objJsonResult;
                }                

                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();


                var sql = "select * from h_v_Gy_BarCodeBillList_APP where æ¡ç ç¼–号='"+ HBarCodeNo + "'";

                DataSet ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeBillList_APP");

                //判断条码是否存在条码档案
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "[0000-1-037]查询成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-1-010]没有返回任何记录！当前条码不存在条码档案";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常：" + ex.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region [条码生成接口_小卫镭雕码]
        [Route("Sc_BarCode/SaveSNByICMO_XW")]
        [HttpGet]

 WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2025-11-26T10:01:50.7863694Z;</History>
    <History>True|2025-12-01T03:56:35.8710305Z;True|2025-12-01T11:51:32.4665294+08:00;True|2025-12-01T11:06:02.7468456+08:00;False|2025-12-01T11:04:57.6926682+08:00;True|2025-11-30T16:03:44.3971182+08:00;False|2025-11-30T16:03:19.8504844+08:00;True|2025-11-26T18:01:50.7863694+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -294,10 +294,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/26/2025 18:01:47</publishTime>
      <publishTime>12/01/2025 11:56:33</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/26/2025 18:01:47</publishTime>
      <publishTime>12/01/2025 11:56:33</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 WorkM/Á÷ת¿¨¹ÜÀí/Sc_ProcessExchangeBill_DH.cs

@@ -393,11 +393,11 @@
                        BillNew.omodel.HMaterIDD = "";
                        BillNew.omodel.HICMOInterID = HICMOInterID;
                        BillNew.omodel.HICMOEntryID = HICMOEntryID;
                        BillNew.omodel.HPicNumVer = "";
                        BillNew.omodel.HPicNumAssemble = "";
                        BillNew.omodel.HMaterTexture = "";
                        BillNew.omodel.HProductNum = "";
                        BillNew.omodel.HVerNum = "";
                        BillNew.omodel.HPicNumVer = ds.Tables[0].Rows[0]["HPicNumVer"].ToString();
                        BillNew.omodel.HPicNumAssemble = ds.Tables[0].Rows[0]["HPicNumAssemble"].ToString();
                        BillNew.omodel.HMaterTexture = ds.Tables[0].Rows[0]["HMaterTexture"].ToString();
                        BillNew.omodel.HProductNum = ds.Tables[0].Rows[0]["HProductNum"].ToString();
                        BillNew.omodel.HVerNum = ds.Tables[0].Rows[0]["HVerNum"].ToString();
                        BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;
                        BillNew.omodel.HBLFlag = false;
                        BillNew.omodel.HCusNumber = "";
@@ -502,15 +502,15 @@
                        oBillSub.HWWOrderBillNo = "";
                        oBillSub.HReportQty = 0;
                        oBillSub.HBackProc = false;
                        oBillSub.HSupID = 0;
                        oBillSub.HSupFlag = false;
                        oBillSub.HSupID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[j]["HSupID"]);
                        oBillSub.HSupFlag = DBUtility.ClsPub.isBool(ds.Tables[0].Rows[j]["HSupFlag"]);
                        oBillSub.HOverRate = 0;
                        oBillSub.HMaxQty = 0;
                        oBillSub.HTechnologyParameter = "";
                        oBillSub.HTechnologyParameter = ds.Tables[0].Rows[j]["HTechnologyParameter"].ToString();
                        oBillSub.HProcCheckNote = "";
                        oBillSub.HPicNum = "";
                        oBillSub.HMouldNo = "";
                        oBillSub.HProcWorkNum = "";
                        oBillSub.HPicNum = ds.Tables[0].Rows[j]["HPicNum"].ToString();
                        oBillSub.HMouldNo = ds.Tables[0].Rows[j]["HMouldNo"].ToString();
                        oBillSub.HProcWorkNum = ds.Tables[0].Rows[j]["HProcWorkNum"].ToString();
                        oBillSub.HSeOrderInterID = 0;
                        oBillSub.HSeOrderEntryID = 0;
                        oBillSub.HSNCtrl = false;