Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-07-18 7fb870f53ccf134a4f3baef58ff98917d8c712bb

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/¼Æ»®¹ÜÀí/ClsGy_MaterialTechParamBillMain.cs

@@ -54,6 +54,7 @@
                    "', HProcID  = '" + omodel.HProcID +
                    "', HEquipID  = '" + omodel.HEquipID +
                    "', HOrgID      = '" + omodel.HOrgID +
                    "', HMouldID = '" + omodel.HMouldID +
                    "' where HInterID = " + omodel.HInterID;

                oCn.RunProc(mainSql);
@@ -131,7 +132,7 @@
                //插入主表
                string mainSql = "insert into Gy_MaterialTechParamBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
                    ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID,HProcID ) " +
                    ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID,HProcID,HMouldID ) " +
                    "values(" +
                    "" + omodel.HYear.ToString() +
                    "," + omodel.HPeriod.ToString() +
@@ -149,7 +150,8 @@
                    "','" + omodel.HWorkCenterID +
                    "','" + omodel.HEquipID +
                    "','" + omodel.HOrgID +
                     "','" + omodel.HProcID +
                    "','" + omodel.HProcID +
                     "','" + omodel.HMouldID +
                    "')";

                oCn.RunProc(mainSql);

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSc_ICMOBillMain.cs

@@ -26,6 +26,7 @@
        public Int64 HRoutingInterID;     //    --工艺路线ID
        public Int64 HOWNERID;     //    --货主
        public string HOWNERTYPEID;     //    --货主类型
        public string HComboXSLX;     
        public DateTime HPlanBeginDate;      //计划开工日期
        public DateTime HPlanEndDate;        //计划完工日期
        public DateTime HBeginDate;    // --最迟开工日期         

 Model/¼Æ»®¹ÜÀí/ClsGy_MaterialTechParamBillMain.cs

@@ -14,6 +14,7 @@
        public Int64 HWorkCenterID;    //int       å·¥ä½œä¸­å¿ƒ
        public Int64 HEquipID;    //int      è®¾å¤‡ID
        public Int64 HProcID;      //int  å·¥åº
        public Int64 HMouldID;      //int  æ¨¡å…·ID 

    }
}

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -736,7 +736,7 @@
                {
                    if (HBarCode.Length == 29)
                    {
                        string str1 = HBarCode.Substring(23, 3);
                        string str1 = HBarCode.Substring(18, 8);

                        DataSet dataSet = oCN.RunProcReturn(@"select  m.HNumber ç‰©æ–™ä»£ç ,o.HNumber ç»„织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
@@ -768,7 +768,7 @@
                }
                else {
                   
                    string str1 = HBarCode.Substring(23, 3);
                    string str1 = HBarCode.Substring(18, 8);

                    DataSet dataSet = oCN.RunProcReturn(@"select  m.HNumber ç‰©æ–™ä»£ç ,o.HNumber ç»„织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID

 WebAPI/Controllers/ProductInController.cs

@@ -264,8 +264,11 @@
            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            string sExpressNumber = "";
            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);

            Kf_MateOutBillController obill = new Kf_MateOutBillController();
            //重新同步生产领料单
            objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);

            WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {

 WebAPI/Controllers/QC_ManagementController.cs

@@ -266,7 +266,7 @@
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where å…³é—­äºº='' ";
                    string sql = sql1 + sqlWhere+ " order by hmainid desc ";
                    string sql = sql1 + sqlWhere+ " order by åˆ¶å•æ—¥æœŸ desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                }
            }

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutBillController.cs

@@ -1338,48 +1338,6 @@
                        oCn.RunProc("Delete b from Kf_ICStockBillMain a inner join Kf_ICStockBillSub b on a.HInterID=b.HInterID where a.HBillNo = '" + HBillNo + "' and a.HBillType='1204'", ref DBUtility.ClsPub.sExeReturnInfo);
                        oCn.RunProc("Delete from Kf_ICStockBillMain where HBillNo = '" + HBillNo + "' and HBillType='1204'", ref DBUtility.ClsPub.sExeReturnInfo);

                        ////主表数据赋值
                        //var MainData = new
                        //{
                        //    HInterID = HNewInterID,
                        //    HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                        //    HBillType = "1204",
                        //    HBillSubType = "1204",
                        //    HMainSourceBillType = "",
                        //    HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
                        //    HSupID = 0,
                        //    HWHID = 0,
                        //    HSCWHID = 0,
                        //    HEmpID = 0,
                        //    HManagerID = 0,
                        //    HSecManagerID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PickerId_Id"]),
                        //    HKeeperID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["FSTOCKERID_Id"]),
                        //    HDeptID = 0,
                        //    HCurID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CurrId_Id"]),
                        //    HSeOrderBillNo = "",
                        //    HExplanation = "CLD导入",
                        //    HRemark = "",
                        //    HInnerBillNo = "",
                        //    HRedBlueFlag = 0,
                        //    HBillStatus = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? 1 : 2,
                        //    HMaker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CreatorId"]["Name"]),
                        //    HMakeDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CreateDate"]),
                        //    //HChecker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]),
                        //    HChecker = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]["Name"]),
                        //    HCheckDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ApproveDate"]),
                        //    HUpDater = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ModifierId_Id"]),
                        //    HUpDateDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ModifyDate"]),
                        //    HDeleteMan = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CANCELER_Id"]),
                        //    HDeleteDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CancelDate"]),
                        //    HOWNERID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["OwnerId_Id"]),
                        //    HOWNERTYPEID = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["OwnerTypeId"]),
                        //    HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
                        //    HERPBillType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillType_Id"]),
                        //    HERPBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                        //    HPRDORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PrdOrgId_Id"]),
                        //    HSTOCKORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOrgId_Id"]),
                        //};

                        //主表数据赋值
                        var MainData = new
                        {

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutRequestBillController.cs

@@ -11,7 +11,7 @@
using WebAPI.Models;


namespace WebAPI.Controllers.仓存管理.领料发货
namespace WebAPI.Controllers
{
    public class Kf_MateOutRequestBillController : ApiController
    {
@@ -19,6 +19,7 @@
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        public string HManagerID { get; private set; }

@@ -329,5 +330,258 @@
            }
        }


        #region æ ¹æ®å•æ®å·ï¼ŒåŒæ­¥ç”Ÿäº§å‘料通知单(领用申请单)
        [Route("Kf_MateOutRequestBillController/GetKf_MateOutRequestBill_Sync_Json")]
        [HttpGet]
        public json GetKf_MateOutRequestBill_Sync_Json(string HBillNo, string HBillType)
        {
            try
            {
                //获取系统参数
                string sql = string.Empty;
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    //系统参数是否为私有云模式,N为公有云模式，Y为私有云模式
                    //私有云模式，通过调用存储过程进行同步
                    if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "Y")
                    {
                        ds = oCn.RunProcReturn("exec h_p_IFCLD_ERPSourceBillToLocal_MateOutRequest '" + HBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_MateOutRequest");
                        if (ds == null || ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据同步发生错误！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 2)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "单据同步成功！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }
                    //公有云模式，通过调用WEBAPI方式进行同步
                    else if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N")
                    {
                        //判断金蝶云是否登录成功
                        var loginRet = InvokeHelper.Login();
                        var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                        //判断是否登录成功
                        if (isSuccess <= 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "同步失败，金蝶云登入不成功，请确认C盘配置文件所设置金蝶云对应网址、账套、登录用户、登录密码是否正确！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        var json = new
                        {
                            CreateOrgId = 0,
                            Number = HBillNo,
                            Id = ""
                        };
                        //查看 èŽ·å–数据                    
                        var _result = InvokeHelper.View("PRD_ISSUEMTRNOTICE", JsonConvert.SerializeObject(json));
                        var _saveObj = JObject.Parse(_result);
                        //判断金蝶云数据是否获取成功
                        if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "金蝶云生产发料通知单获取失败：" + _result;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        oCn.BeginTran();
                        //根据单据号删除本地生产发料通知单中对应单据
                        oCn.RunProc("Delete b from Kf_MateOutRequestBillMain a inner join Kf_MateOutRequestBillSub b on a.HInterID=b.HInterID where a.HBillNo = '" + HBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                        oCn.RunProc("Delete from Kf_MateOutRequestBillMain where HBillNo = '" + HBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);

                        //主表数据赋值
                        var MainData = new
                        {
                            HInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
                            HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                            HBillType = "1214",
                            HBillSubType = "1214",
                            HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
                            HBillStatus = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? 1 : 2,
                            HInnerBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                            HRemark = "CLD导入",
                            HEmpID = 0,
                            HManagerID = 0,
                            HSecManagerID = 0,
                            HKeeperID = 0,
                            HDeptID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["WorkShopId_Id"]),
                            HExplanation = "",
                            HICCard = "",
                            HSUPPLYType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["IssueType"]),
                            HPRDORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PrdOrgId_Id"]),
                            HMaker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CreatorId"]["Name"]),
                            HMakeDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CreateDate"]),
                            HChecker = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]["Name"]),
                            HCheckDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ApproveDate"]),
                            HUpDater = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ModifierId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ModifierId"]["Name"]),
                            HUpDateDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ModifyDate"]),
                            HDeleteMan = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CANCELER_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CANCELER"]["Name"]),
                            HDeleteDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CancelDate"]),
                        };
                        //写入主表
                        sql = $@"Insert into Kf_MateOutRequestBillMain
                                    (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
                                    ,HBillNo,HBillStatus,HInnerBillNo,HRemark
                                    ,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                                    ,HExplanation,HICCard,HSUPPLYType,HPRDORGID
                                    ,HMaker,HMakeDate
                                    ,HChecker,HCheckDate
                                    ,HUpDater,HUpDateDate
                                    ,HDeleteMan,HDeleteDate)
                                    Values({MainData.HInterID},year('{MainData.HDate}'),month('{MainData.HDate}'),'{MainData.HBillType}','{MainData.HBillSubType}','{MainData.HDate}'
                                    ,'{MainData.HBillNo}',{MainData.HBillStatus},'{MainData.HInnerBillNo}','{MainData.HRemark}'
                                    , {MainData.HEmpID},{MainData.HManagerID},{MainData.HSecManagerID},{MainData.HKeeperID},{MainData.HDeptID}
                                    ,'{MainData.HExplanation}','{MainData.HICCard}','{MainData.HSUPPLYType}',{MainData.HPRDORGID}
                                    ,'{MainData.HMaker}','{MainData.HMakeDate}'
                                    ,'{MainData.HChecker}',case when '{MainData.HCheckDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HCheckDate}' end
                                    ,'{MainData.HUpDater}',case when '{MainData.HUpDateDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HUpDateDate}' end
                                    ,'{MainData.HDeleteMan}',case when '{MainData.HDeleteDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HDeleteDate}' end)";
                        oCn.RunProc(sql.Replace("\r\n", ""));

                        //子表数据赋值
                        var dataArr = _saveObj["Result"]["Result"]["DetailEntity"];
                        foreach (var oSub in dataArr)
                        {
                            var subData = new
                            {
                                HInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
                                HEntryID = DBUtility.ClsPub.isLong(oSub["Id"]),
                                HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
                                HERPEntryID = DBUtility.ClsPub.isLong(oSub["Id"]),
                                HSEQ = DBUtility.ClsPub.isLong(oSub["Seq"]),
                                HRemark = "",
                                HMaterID = DBUtility.ClsPub.isLong(oSub["MATERIALID_Id"]),
                                HProdMaterID = DBUtility.ClsPub.isLong(oSub["PMATERIALID_Id"]),
                                HUnitID = DBUtility.ClsPub.isLong(oSub["UnitID_Id"]),
                                HAuxPropID = DBUtility.ClsPub.isLong(oSub["AuxPropID_Id"]),
                                HBatchNO = DBUtility.ClsPub.isStrNull(oSub["Lot_Text"]),
                                HWHID = DBUtility.ClsPub.isLong(oSub["StockID_Id"]),
                                HSPID = DBUtility.ClsPub.isLong(oSub["StockLOCID_Id"]),
                                HPrice = 0,
                                HMoney = 0,
                                HMTONo = DBUtility.ClsPub.isStrNull(oSub["CHILDMTONO"]),
                                HPlanMode = 0,
                                HStockStatusID = DBUtility.ClsPub.isLong(oSub["StockStatusId_Id"]),
                                HQty = DBUtility.ClsPub.isDoule(oSub["AppQty"]),
                                HQtyMust = DBUtility.ClsPub.isDoule(oSub["MustQty"]),
                                HRelationQty = DBUtility.ClsPub.isDoule(oSub["ActPickedQty"]),
                                HMoveStockQty = 0,
                                HRelationMoney = 0,
                                HSourceInterID = 0,
                                HSourceEntryID = 0,
                                HSourceBillNo = DBUtility.ClsPub.isStrNull(oSub["MOBILLNO"]),
                                HSourceBillType = "3710",
                                HPPBOMInterID = DBUtility.ClsPub.isLong(oSub["PPBomId"]),
                                HPPBOMEntryID = DBUtility.ClsPub.isLong(oSub["PPBomEntryId"]),
                                HPPBOMEntrySEQ = 0,
                                HPPBOMBillNo = "",
                                HICMOInterID = 0,
                                HICMOEntryID = 0,
                                HICMOEntrySEQ = DBUtility.ClsPub.isLong(oSub["MOBILLSEQ"]),
                                HICMOBillNo = DBUtility.ClsPub.isStrNull(oSub["MOBILLNO"]),
                                HPOOrderInterID = 0,
                                HPOOrderEntryID = 0,
                                HPOOrderBillNo = "",
                                HOWNERID = DBUtility.ClsPub.isLong(oSub["OwnerID_Id"]),
                                HOWNERTYPEID = DBUtility.ClsPub.isStrNull(oSub["OwnerTypeId"]),
                                HKEEPERID = DBUtility.ClsPub.isLong(oSub["KeeperId_Id"]),
                                HKEEPERTYPEID = DBUtility.ClsPub.isStrNull(oSub["KeeperTypeId"]),
                                HSUPPLYORGID = DBUtility.ClsPub.isLong(oSub["SupplyOrgId_Id"]),
                                HBOMID = DBUtility.ClsPub.isLong(oSub["FChildBomID_Id"]),
                                HProcessID = DBUtility.ClsPub.isLong(oSub["ProcessID_Id"]),
                                HBaseUnitID = DBUtility.ClsPub.isLong(oSub["BaseUnitID_Id"]),
                                HOperID = DBUtility.ClsPub.isLong(oSub["OperID"]),
                                HOptQueue = DBUtility.ClsPub.isStrNull(oSub["OptQueue"]),
                                HGroupRowId = DBUtility.ClsPub.isStrNull(oSub["GroupRowId"]),
                            };

                            //写入子表
                            sql = $@"Insert into Kf_MateOutRequestBillSub
                                        (HInterID,HEntryID,HERPInterID,HERPEntryID,HSEQ,HRemark
                                        ,HMaterID,HProdMaterID,HUnitID,HAuxPropID,HBatchNO,HWHID,HSPID
                                        ,HPrice,HMoney,HMTONo,HPlanMode,HStockStatusID,HDate
                                        ,HQty,HQtyMust,HRelationQty,HMoveStockQty,HRelationMoney
                                        ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
                                        ,HPPBOMInterID,HPPBOMEntryID,HPPBOMEntrySEQ,HPPBOMBillNo
                                        ,HICMOInterID,HICMOEntryID,HICMOEntrySEQ,HICMOBillNo
                                        ,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo
                                        ,HOWNERID,HOWNERTYPEID,HKEEPERID,HKEEPERTYPEID,HSUPPLYORGID
                                        ,HBOMID,HProcessID,HBaseUnitID,HOperID,HOptQueue,HGroupRowId)
                                        Values ({subData.HInterID},{subData.HEntryID},{subData.HERPInterID},{subData.HERPEntryID},{subData.HSEQ},'{subData.HRemark}'
                                        ,{subData.HMaterID},{subData.HProdMaterID},{subData.HUnitID},{subData.HAuxPropID},'{subData.HBatchNO}',{subData.HWHID},{subData.HSPID}
                                        ,{subData.HPrice},{subData.HMoney},'{subData.HMTONo}',{subData.HPlanMode},{subData.HStockStatusID},getdate()
                                        ,{subData.HQty},{subData.HQtyMust},{subData.HRelationQty},{subData.HMoveStockQty},{subData.HRelationMoney}
                                        ,{subData.HSourceInterID},{subData.HSourceEntryID},'{subData.HSourceBillNo}','{subData.HSourceBillType}'
                                        ,{subData.HPPBOMInterID},{subData.HPPBOMEntryID},{subData.HPPBOMEntrySEQ},'{subData.HPPBOMBillNo}'
                                        ,{subData.HICMOInterID},{subData.HICMOEntryID},{subData.HICMOEntrySEQ},'{subData.HICMOBillNo}'
                                        ,{subData.HPOOrderInterID},{subData.HPOOrderEntryID},'{subData.HPOOrderBillNo}'
                                        ,{subData.HOWNERID},'{subData.HOWNERTYPEID}',{subData.HKEEPERID},'{subData.HKEEPERTYPEID}',{subData.HSUPPLYORGID}
                                        ,{ subData.HBOMID},{subData.HProcessID},{ subData.HBaseUnitID},{subData.HOperID},'{ subData.HOptQueue}','{ subData.HGroupRowId}')";
                            oCn.RunProc(sql.Replace("\r\n", ""));
                        }

                        oCn.Commit();
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "单据同步成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "不支持同步功能！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据同步失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs

@@ -34,7 +34,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_PatrolProcCheckOtherBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid ";
                string sql = sql1 + sWhere + " order by åˆ¶å•æ—¥æœŸ desc ";
                ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckOtherBill");

                //添加列名

 WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs

@@ -85,7 +85,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");

                //添加列名
@@ -136,7 +136,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_ProcessCheckBillMainList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");

                //添加列名

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs

@@ -34,7 +34,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_FirstPieceCheckBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBill");

                //添加列名
@@ -85,7 +85,7 @@
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from h_v_QC_FirstPieceCheckBillMainList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + "  ";
                ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");

                //添加列名

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -3778,31 +3778,55 @@
        [HttpGet]
        public object get_SourceBarCode_MateOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HStockOrgID)
        {
            try
            //获取系统参数
            string sErrMsg = "";
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                if (WebSoBar == null)
                if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //系统参数是否为私有云模式,N为公有云模式，Y为私有云模式
                {
                    if(HSourceBillType == "1214")
                    {
                        //重新同步生产发料通知单
                        Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
                        objJsonResult = obill.GetKf_MateOutRequestBill_Sync_Json(HSourceBillNo, HSourceBillType);
                    }
                }

                try
                {
                    WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                    if (WebSoBar == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功";
                        objJsonResult.data = WebSoBar;
                        return objJsonResult;
                    }
                }
                catch (Exception e)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "扫描源单条码失败！" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = WebSoBar;
                    return objJsonResult;
                }

            }
            catch (Exception e)
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描源单条码失败！" + e.ToString();
                objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -6186,26 +6210,7 @@
                                HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            }

                            string HSourceInterIDs = "0";
                            string HSourceEntryIDs = "0";
                            string HSourceBillNos = "0";
                            string HUnitIDs = "0";
                            //查询采购订单
                            ds = oCn.RunProcReturn(@"select  a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + str[3] + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                //sErrMsg = "条码解析失败,请确认条码采购订单是否正确!";
                                //return null;
                            }
                            else
                            {
                                HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
                                HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
                                HSourceBillNos = ds.Tables[0].Rows[0]["HBillNo"].ToString();
                                HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
                            }

                            string HInnerBillNos = "";
                            //查询内部采购订单号
                            ds = oCn.RunProcReturn(@" select * from h_v_IF_POInStockList where é‡‡è´­è®¢å•å·= '" + str[3] + "' ", "h_v_IF_POInStockList");
@@ -6218,7 +6223,27 @@
                            else
                            {
                                HInnerBillNos = ds.Tables[0].Rows[0]["内部采购订单号"].ToString();
                                HSourceBillNos = ds.Tables[0].Rows[0]["采购订单号"].ToString();
                            }

                            string HSourceInterIDs = "0";
                            string HSourceEntryIDs = "0";
                            string HUnitIDs = "0";
                            //查询采购订单
                            ds = oCn.RunProcReturn(@"select  a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + HSourceBillNos + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                //sErrMsg = "条码解析失败,请确认条码采购订单是否正确!";
                                //return null;
                            }
                            else
                            {
                                HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
                                HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
                                HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
                            }

                            double HQty = double.Parse(str[6]);

                            //日期获取方式

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -330,24 +330,24 @@
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID,HOWNERTYPEID)
                        ,HOWNERID,HOWNERTYPEID,HComboXSLX)
                        values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
                "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate(),'" + mainList[0].HMaker + "',getdate()" +
                ",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
                "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
                "," + mainList[0].HOWNERID + ",'" + mainList[0].HOWNERTYPEID + "') ");
                "," + mainList[0].HOWNERID + ",'" + mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
                //主表
                oCN.RunProc(@"Insert Into Sc_ICMOBillMain   
                        (HBillType,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID,HOWNERTYPEID)
                        ,HOWNERID,HOWNERTYPEID,HComboXSLX)
                        values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
                "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate(),'" + mainList[0].HMaker + "',getdate()" +
                ",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
                "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
                ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "') ");
                ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
                //保存主表
                foreach (var oSub in subList)
                {

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -68,6 +68,31 @@
                oCn.RunProc(sql);
                sql = "set identity_insert gy_material on";
                oCn.RunProc(sql);
                LogService.Write("物料:" + "Insert into Gy_Material (" +
                    "HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
                    ",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" +
                    ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
                    ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
                    ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID" +
                    ",HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber" +
                    ",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
                    ",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
                    ", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID) " +
                    " Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString()
                    + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "','" +
                    oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "'," +
                    oModel.HLength.ToString() + "," + oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + "," +
                   oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + "," +
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ")");
                oCn.RunProc("Insert into Gy_Material (" +
                    "HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
@@ -75,14 +100,24 @@
                    ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
                    ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
                    ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost) " +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID" +
                    ",HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager,HOldMaterNumber" +
                    ",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
                    ",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
                    ", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID) " +
                    " Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "','" + oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString()
                    + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "','" + 
                    oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
                    oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
                   oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                sql = "set identity_insert gy_material off";
                oCn.RunProc(sql);
                //修改上级为非末级代码

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -42,9 +42,13 @@
        public int HUSEORGID;
        public int HERPItemID;
        public int HCREATEORGID;
        public int HPlanMode;
        public int HBatchManager;
        public string HOldMaterNumber;
        public double HWidth; //幅宽
        public double HLength;  
        public double HHeight;  
        public double HJQty;  
        public double HWeight; //克重
        public string HColorRemark; //染色要求

@@ -53,12 +57,18 @@
        public int HBASEUNITID; //基本计量单位(gy_unit)
        public int HSTOREUNITID; //库存计量单位(gy_unit)
        public int HCHECKINCOMING; //是否来料检验
        public int HAuxPropFlag;  
        public int HCHECKPRODUCT; //是否产品检验
        public double HPERUNITSTANDHOUR; //标准工时
        public double HSTDLABORPREPARETIME; //标准人员准备工时
        public double HSTDMACHINEPREPARETIME; //标准机器准备工时
        public string HMaterRuleType; //物料公式

        public int HSNUnitID;
        public int HMASTERID;
        public int HISKFPERIOD;
        public int HAuxUnitID;
        public double HEXPPERIOD;
        public int HQCSchemeID_Fst;
        public int HQCSchemeID_Proc;
        public int HQCSchemeID_Patrol;
@@ -84,5 +94,6 @@
        public string HTela_M;//毛纱名称及规格
        public string HUnderTela_M;//底丝
        public string HSizing_M;//定型浆料
        public string HEXPUNIT; 
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-07-17T02:34:20.6073593Z;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <History>True|2024-07-17T05:18:07.5448501Z;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/17/2024 10:34:05</publishTime>
      <publishTime>07/17/2024 13:17:54</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/17/2024 10:34:05</publishTime>
      <publishTime>07/17/2024 13:17:54</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/17/2024 10:34:04</publishTime>
      <publishTime>07/17/2024 13:17:53</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/17/2024 10:34:04</publishTime>
      <publishTime>07/17/2024 13:17:53</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/17/2024 10:34:01</publishTime>
      <publishTime>07/17/2024 13:17:50</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/17/2024 10:34:01</publishTime>
      <publishTime>07/17/2024 13:17:50</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/17/2024 10:34:01</publishTime>
      <publishTime>07/17/2024 13:17:51</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/17/2024 10:34:01</publishTime>
      <publishTime>07/17/2024 13:17:51</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/17/2024 10:33:58</publishTime>
      <publishTime>07/17/2024 13:17:48</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/17/2024 10:33:58</publishTime>
      <publishTime>07/17/2024 13:17:48</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/17/2024 10:33:59</publishTime>
      <publishTime>07/17/2024 13:17:49</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/17/2024 10:33:59</publishTime>
      <publishTime>07/17/2024 13:17:49</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/17/2024 10:34:00</publishTime>
      <publishTime>07/17/2024 13:17:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/17/2024 10:34:00</publishTime>
      <publishTime>07/17/2024 13:17:50</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/17/2024 10:34:12</publishTime>
      <publishTime>07/17/2024 13:18:00</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/17/2024 10:34:12</publishTime>
      <publishTime>07/17/2024 13:18:00</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/17/2024 10:34:19</publishTime>
      <publishTime>07/17/2024 13:18:06</publishTime>
    </File>
  </ItemGroup>
</Project>