作业指导书删除功能，增加自动审核入库申请单系统参数，排产添加操作工字段；屏蔽扫码同步入库申请单

yusijie

2024-08-15 a45d2cef5657df1a8a107024dba656789a4baf5f

作业指导书删除功能，增加自动审核入库申请单系统参数，排产添加操作工字段；屏蔽扫码同步入库申请单

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1941,7 +1941,11 @@
                    {
                        omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //==============================入库申请单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_StockInRequestBill_AutoCheck")
                    {
                        omodel.Kf_StockInRequestBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    ////=========工序进站单
                    ////自动匹配流水号

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -627,12 +627,15 @@
        public string Gy_RoutingBill_SaveAutoAddnew;                //保存后变为新增状态
        public string Gy_RoutingBill_DeleterAndMakerMustSame;       //删除人必须是制单人
        public string Gy_RoutingBill_SaveAutoLastProc;              //保存到数据库时自动加上转工序
        


        ////工序进站单
        //public string MES_StationBill_ProcNo; //自动匹配流水号
        //public string MES_StationBill_ProcNoByUser; //只显示用户对应工序

        //入库申请
        public string Kf_StockInRequestBill_AutoCheck;       //保存后是否自动审核

    }
         
}

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -1911,7 +1911,6 @@
        }
        #endregion


        #region å·¥åºæµè½¬å¡åˆ—表
        /// <summary>
        /// èŽ·å–工序流转卡列表信息
@@ -1965,5 +1964,71 @@
        }
        #endregion

        #region[批量拆分生成流转卡]
        /// <summary>
        /// è¿”回拆分后的生产订单信息
        /// </summary>
        /// <param name="hmainid">生产任务单主子ID</param>
        /// <returns>object</returns>
        [Route("Sc_ProcessExchangeBill/BatchSpilt")]
        [HttpGet]
        public object BatchSpilt(string HInterID, string user)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "源单主子id为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string[] HInterEntryIDArr = HInterID.Split(',');

                string[] HData;

                for (int i = 0; i < HInterEntryIDArr.Length; i++)
                {
                    string[] HIDs = HInterEntryIDArr[i].Split('@');

                    string sql = "exec h_p_Sc_ProcessExchange_BatchSplit '" + HIDs[0] + "','" + HIDs[1] + "'";

                    ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchange_BatchSplit");


                }

               

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "拆分生产订单无数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/OtherInStockController.cs

@@ -78,265 +78,248 @@

            string sErrMsg = "";
            bool bResult;
            //获取系统参数
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "森楷") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                {
                    DataSet ds;
                    string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sCode + "'";
                    string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//获取金蝶数据库名称
                    string HSourceBillNo = "";
                    Int64 HSourceInterID = 0;
            ////获取系统参数
            //if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            //{
            //    if (oSystemParameter.omodel.WMS_CampanyName == "森楷" && sSourceType == "1241") //客户为森楷，并且为其他入库单模块时进入判断
            //    {
            //        DataSet ds;
            //        string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sCode + "'";
            //        string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//获取金蝶数据库名称
            //        string HSourceBillNo = "";
            //        Int64 HSourceInterID = 0;

                    ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
                    //判断条码信息是否在条码档案中
                    if (ds == null || ds.Tables[0].Rows.Count < 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "条码档案中不存在条码编号：" + sCode;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        //获取入库申请单单号/主ID
                        HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
                        HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);                        
                        //根据入库申请单单号判断单据信息是否已经同步到金蝶
                        sql = string.Format(@"select * from FROM {0}..T_STK_MISCELLANEOUS with(nolock) where FBILLNO = '" + HSourceBillNo + "'", HDataBaseName);
                        ds = oCn.RunProcReturn(sql, "T_STK_MISCELLANEOUS");
                        //入库申请单没有同步到金蝶则进行同步
                        if (ds == null || ds.Tables[0].Rows.Count < 1)
                        {
                            sql = "exec h_p_Kf_StockInRequestBillToErp " + HSourceInterID + "," + HSourceBillNo;
                            ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");
            //        ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
            //        //判断条码信息是否在条码档案中
            //        if (ds == null || ds.Tables[0].Rows.Count < 1)
            //        {
            //            objJsonResult.code = "0";
            //            objJsonResult.count = 0;
            //            objJsonResult.Message = "条码档案中不存在此条码编号：" + sCode;
            //            objJsonResult.data = null;
            //            return objJsonResult;
            //        }
            //        else
            //        {
            //            //获取入库申请单单号/主ID
            //            HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
            //            HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);                        
            //            //根据入库申请单单号判断单据信息是否已经同步到金蝶
            //            sql = string.Format(@"select * from FROM {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo + "'", HDataBaseName);
            //            ds = oCn.RunProcReturn(sql, "TFKO_t_Cust100009");
            //            //入库申请单没有同步到金蝶则进行同步
            //            if (ds == null || ds.Tables[0].Rows.Count < 1)
            //            {
            //                sql = "exec h_p_Kf_StockInRequestBillToErp " + HSourceInterID + "," + HSourceBillNo;
            //                ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

                            if (ds == null || ds.Tables[0].Rows.Count == 0)
                            {
                                oCn.RollBack();
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "webapi入库申请单同步，获取信息失败";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                JObject model = new JObject();
                                model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //单据类型
                                model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["日期"])); //单据日期                   
                                model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存组织代码"]) }); //库存组织代码
                                model.Add("FBillNo", HSourceBillNo); //单据号
                                model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存方向"])); //库存方向                   
                                model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产车间
                                model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["入库码单"])); //入库码单              
                                model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒子数"])); //筒子数              
                                model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒管只数"])); //筒管只数            
                                model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["定长"])); //定长              
                                model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒重"])); //筒重              
                                model.Add("F_paez_Base", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["工号"])); //工号              
                                model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["班次代码"])); //班次              
                                model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["批号"])); //批号              
                                model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱数"])); //箱数              
                                model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["总重"])); //总重              
                                model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["成品编码"])); //成品编码              
                                model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["品名"])); //品名              
                                model.Add("F_paez_Base1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //线号              
            //                if (ds == null || ds.Tables[0].Rows.Count == 0)
            //                {
            //                    oCn.RollBack();
            //                    objJsonResult.code = "0";
            //                    objJsonResult.count = 0;
            //                    objJsonResult.Message = "webapi入库申请单同步，获取信息失败";
            //                    objJsonResult.data = null;
            //                    return objJsonResult;
            //                }
            //                else
            //                {
            //                    JObject model = new JObject();
            //                    //model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //单据类型
            //                    model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["日期"])); //单据日期                   
            //                    model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存组织代码"]) }); //库存组织代码
            //                    model.Add("FBillNo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["单据号"])); //单据号
            //                    model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["库存方向"])); //库存方向                   
            //                    model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产车间
            //                    model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["入库码单"])); //入库码单              
            //                    model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒子数"])); //筒子数              
            //                    model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒管只数"])); //筒管只数            
            //                    model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["定长"])); //定长              
            //                    //model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["筒重"])); //筒重              
            //                    model.Add("F_paez_Base", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["工号"])); //工号              
            //                    model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["班次代码"])); //班次              
            //                    //model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["批号"])); //批号              
            //                    model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱数"])); //箱数              
            //                    model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["总重"])); //总重              
            //                    //model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["成品编码"])); //成品编码              
            //                    //model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["品名"])); //品名              
            //                    model.Add("F_paez_Base1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //线号              

                                model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["机台"])); //机台              
                                model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱重"])); //箱重              
                                //model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["来源"])); //来源              
                                model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) });//部门       
                                model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["捻向"])); //捻向              
                                model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["管色"])); //管色              
                                model.Add("F_paez_Assistant", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["等级"])); //等级              
                                model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最小箱号"])); //最小箱号              
                                //model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["文本"])); //文本              
                                model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最大箱号"])); //最大箱号              
                                //model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["打印次数"])); //打印次数              
                                //model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //条码打印              
                                model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产部门              
                                model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["是否内外贸"])); //是否内外贸              
                                model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["产品类型"])); //产品类型              
                                model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["满版状态"])); //满版状态              
                                model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["规格型号"])); //规格型号              
                                model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别              
                                model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱号前缀"])); //箱号前缀              
                                model.Add("F_paez_WB", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别1              
            //                    //model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["机台"])); //机台              
            //                    model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱重"])); //箱重              
            //                    //model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["来源"])); //来源              
            //                    model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) });//部门       
            //                    //model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["捻向"])); //捻向              
            //                    //model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["管色"])); //管色              
            //                    model.Add("F_paez_Assistant", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["等级"])); //等级              
            //                    model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最小箱号"])); //最小箱号              
            //                    //model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["文本"])); //文本              
            //                    model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["最大箱号"])); //最大箱号              
            //                    //model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["打印次数"])); //打印次数              
            //                    //model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["线号"])); //条码打印              
            //                    //model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["部门代码"]) }); //生产部门              
            //                    model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["是否内外贸"])); //是否内外贸              
            //                    model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["产品类型"])); //产品类型              
            //                    model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["满版状态"])); //满版状态              
            //                    //model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["规格型号"])); //规格型号              
            //                    //model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别              
            //                    //model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["箱号前缀"])); //箱号前缀              
            //                    model.Add("F_paez_WB", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["网别"])); //网别1              


                                JArray Fentity = new JArray();
                                foreach (DataRow item in ds.Tables[1].Rows)
                                {
                                    JObject FentityModel = new JObject();
                                    FentityModel.Add("FSrcEntryId", item["FSRCENTRYID"].ToString());//  æºå•åˆ†å½•å†…码、
                                    FentityModel.Add("FIsNew", item["FIsNew"].ToString());//  æºå•ç±»åž‹ 
                                    FentityModel.Add("FMaterialId", new JObject() { ["FNumber"] = item["FMaterialId"].ToString() }); // ç‰©æ–™ç¼–码 
                                    FentityModel.Add("FREPORTTYPE", new JObject() { ["FNumber"] = item["FREPORTTYPE"].ToString() });  // ç”Ÿäº§æ±‡æŠ¥ç±»åž‹
                                    FentityModel.Add("FProductType", item["FPRODUCTTYPE"].ToString());//      äº§å“ç±»åž‹
                                    FentityModel.Add("FUNITID", new JObject() { ["FNumber"] = item["FUNITID"].ToString() });//单位
                                    FentityModel.Add("FWORKSHIPID", new JObject() { ["FNumber"] = item["FWORKSHOPID"].ToString() });//生产车间
                                    FentityModel.Add("FMTONO", item["FMTONO"].ToString());//   è®¡åˆ’跟踪号
                                    FentityModel.Add("FCheckProduct", item["FCheckProduct"].ToString());//   äº§å“æ£€éªŒ
                                    FentityModel.Add("FISENTRUST", item["FISENTRUST"].ToString());//       ç»„织委托加工
                                    FentityModel.Add("FSrcBillType", item["FSRCBILLTYPE"].ToString());//   æºå•ç±»åž‹
                                    FentityModel.Add("FMOBILLNO", item["FMOBILLNO"].ToString());//  ç”Ÿäº§è®¢å•
                                    FentityModel.Add("FSrcBillNo", item["FSrcBillNo"].ToString());//   æºå•ç¼–号
                                    FentityModel.Add("FMoEntrySeq", item["FMoEntrySeq"].ToString());//生产订单行号
                                    FentityModel.Add("FPROJECTNO", item["FPROJECTNO"].ToString());//  é¡¹ç›®ç¼–号
                                    FentityModel.Add("FSTDMANHOUR", item["FSTDMANHOUR"].ToString());//  å•ä½æ ‡å‡†å·¥æ—¶
                                    FentityModel.Add("FHRPREPARETIME", item["FHRPREPARETIME"].ToString());//  äººå‘˜å‡†å¤‡å·¥æ—¶
                                    FentityModel.Add("FMACPREPARETIME", item["FMACPREPARETIME"].ToString());//  æœºå™¨å‡†å¤‡å·¥æ—¶
                                    FentityModel.Add("FSrcInterId", item["FSrcInterId"].ToString());//  æºå•å†…码
                                    FentityModel.Add("FSrcEntrySeq", item["FSrcEntrySeq"].ToString());//  æºå•è¡Œå·
                                    FentityModel.Add("FMoId", item["FMoId"].ToString());//生产订单内码
                                    FentityModel.Add("FMoEntryId", item["FMoEntryId"].ToString());//生产订单分录号
                                    FentityModel.Add("FBaseUnitID", new JObject() { ["FNumber"] = item["FBaseUnitID"].ToString() });//单位
                                    FentityModel.Add("FSTOCKINORGID", new JObject() { ["FNumber"] = item["FSTOCKINORGID"].ToString() });//入库组织
                                    FentityModel.Add("FOwnerTypeId", item["FOwnerTypeId"].ToString());// è´§ä¸»ç±»åž‹
                                    FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["FOwnerId"].ToString() });// è´§ä¸»
                                    FentityModel.Add("FSTOCKID", new JObject() { ["FNumber"] = item["FSTOCKID"].ToString() });//仓库
                                    FentityModel.Add("FCostRate", item["FCOSTRATE"].ToString());//     æˆæœ¬æƒé‡
                                    FentityModel.Add("FSNUNITID", new JObject() { ["FNumber"] = item["FSNUNITID"].ToString() });//序列号单位
                                    FentityModel.Add("FISBACKFLUSH", item["FISBACKFLUSH"].ToString());//  å€’冲领料
                                    FentityModel.Add("FMOMAINENTRYID", item["FMOMAINENTRYID"].ToString());// ç”Ÿäº§è®¢å•ä¸»äº§å“åˆ†å½•
                                    FentityModel.Add("FQAIP", item["FQAIP"].ToString());//紧急放行
                                    FentityModel.Add("FREQSRC", item["FREQSRC"].ToString());//需求来源
                                    FentityModel.Add("FREQBILLNO", item["FREQBILLNO"].ToString());//需求单据
                                    FentityModel.Add("FREQBILLID", item["FREQBILLID"].ToString());// éœ€æ±‚单据内码
                                    FentityModel.Add("FREQENTRYSEQ", item["FREQENTRYSEQ"].ToString());//需求单据行号
                                    FentityModel.Add("FREQENTRYID", item["FREQENTRYID"].ToString());// éœ€æ±‚单据分录内码
                                    FentityModel.Add("FBASEQUAQTY", item["FBASEQUAQTY"].ToString());// åŸºæœ¬å•ä½åˆæ ¼æ•°é‡
                                    FentityModel.Add("FQUAQTY", item["FQUAQTY"].ToString());//合格数量
                                    FentityModel.Add("FFailQty", item["FFailQty"].ToString());//不合格数量
                                    FentityModel.Add("FScrapQty", item["FScrapQty"].ToString());//报废数量
                                    FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//基本单位完成数量
                                    FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//完成数量
                                    FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//批号                                   
                                    FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOM版本
            //                    JArray Fentity = new JArray();
            //                    foreach (DataRow item in ds.Tables[1].Rows)
            //                    {
            //                        JObject FentityModel = new JObject();
            //                        FentityModel.Add("FMATERIALID", new JObject() { ["FNumber"] = item["物料代码"].ToString() }); // ç‰©æ–™ä»£ç 
            //                        FentityModel.Add("FUnitID", new JObject() { ["FNumber"] = item["计量单位代码"].ToString() });  // å•ä½ä»£ç 
            //                        FentityModel.Add("FQty", item["净重"].ToString()); //净重
            //                        FentityModel.Add("FBASEUNITID", new JObject() { ["FNumber"] = item["基本计量单位代码"].ToString() });  // åŸºæœ¬å•ä½ä»£ç 
            //                        FentityModel.Add("FBASEQTY", item["实收数量"].ToString()); //实收数量
            //                        FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["库存辅计量单位代码"].ToString() });  // åº“存辅计量单位代码
            //                        FentityModel.Add("FSecQTY", item["库存辅单位实收数量"].ToString()); //实收数量（库存辅单位）
            //                        FentityModel.Add("FOWNERTYPEID", item["货主类型"].ToString()); //货主类型
            //                        FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["货主代码"].ToString() });  // è´§ä¸»ä»£ç 
            //                        FentityModel.Add("FKEEPERTYPEID", item["保管者类型"].ToString()); //保管者类型
            //                        FentityModel.Add("FKEEPERID", new JObject() { ["FNumber"] = item["保管者代码"].ToString() });  // ä¿ç®¡è€…代码
            //                        FentityModel.Add("FAuxPropId", new JObject() { ["FAUXPROPID__FF100003"] = new JObject() { ["FNumber"] = item["辅助属性代码"].ToString() } } );  // è¾…助属性
            //                        FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["辅计量单位代码"].ToString() });  // è¾…计量单位代码
            //                        FentityModel.Add("FExtAuxUnitQty", item["箱数"].ToString()); //箱数
            //                        FentityModel.Add("F_TFKO_Assistant", new JObject() { ["FNumber"] = item["网别代码"].ToString() });  // ç½‘别
            //                        FentityModel.Add("F_TFKO_Assistant1", new JObject() { ["FNumber"] = item["孔型代码"].ToString() });  // å­”åž‹
            //                        FentityModel.Add("F_TFKO_Assistant2", new JObject() { ["FNumber"] = item["色泽代码"].ToString() });  // è‰²æ³½
            //                        FentityModel.Add("F_TFKO_Assistant3", new JObject() { ["FNumber"] = item["纤度代码"].ToString() });  // çº¤åº¦
            //                        FentityModel.Add("F_paez_Qty", item["毛重"].ToString()); //毛重
            //                        FentityModel.Add("F_TFKO_Text1", item["管色"].ToString()); //管色
            //                        FentityModel.Add("F_TFKO_Text2", item["捻向"].ToString()); //捻向
            //                        FentityModel.Add("FBoxcode", item["箱号"].ToString()); //箱号
            //                        FentityModel.Add("F_PAEZ_SQSL", item["申请单数量"].ToString()); //申请单数量
            //                        FentityModel.Add("F_paez_Integer4", item["筒子数"].ToString()); //筒子数
            //                        FentityModel.Add("F_paez_BaseQty", item["实发数量"].ToString()); //实发数量
            //                        FentityModel.Add("F_paez_Qty1", item["实收数量"].ToString()); //实收数量
            //                        FentityModel.Add("F_paez_Text2", item["箱号"].ToString()); //箱号

                                    JArray Fentity2 = new JArray();
                                    JObject FentityModel2 = new JObject();
                                    FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
                                    FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
                                    Fentity2.Add(FentityModel2);
                                    FentityModel.Add("FEntity_Link", Fentity2);
                                    FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
                                    Fentity.Add(FentityModel);
                                }
                                model.Add("FEntity", Fentity); //明细信息                       
                                JObject jsonRoot = new JObject()
                                {
                                    ["Creator"] = "",
                                    ["NeedUpDateFields"] = new JArray(),
                                    ["NeedReturnFields"] = new JArray(),
                                    //["IsDeleteEntry"] = "true",
                                    //["SubSystemId"] = "",
                                    //["IsVerifyBaseDataField"] = "false",
                                    ["IsDeleteEntry"] = "true",
                                    ["SubSystemId"] = "",
                                    ["IsVerifyBaseDataField"] = "true",
                                    ["IsEntryBatchFill"] = "false",
                                    ["ValidateFlag"] = "true",
                                    ["NumberSearch"] = "true",
                                    ["IsAutoAdjustField"] = "false",
                                    ["InterationFlags"] = "",
                                    ["IgnoreInterationFlag"] = "",
                                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                                    ["Model"] = model
                                };

                                //从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
                                if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
                                {
                                    oCn.RollBack();
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "入库申请单同步获取登录账号密码失败！";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }
            //                        //JArray Fentity2 = new JArray();
            //                        //JObject FentityModel2 = new JObject();
            //                        //FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
            //                        //FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
            //                        //Fentity2.Add(FentityModel2);
            //                        //FentityModel.Add("FEntity_Link", Fentity2);
            //                        //FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
            //                        Fentity.Add(FentityModel);
            //                    }
            //                    model.Add("FEntity", Fentity); //明细信息                       
            //                    JObject jsonRoot = new JObject()
            //                    {
            //                        ["Creator"] = "",
            //                        ["NeedUpDateFields"] = new JArray(),
            //                        ["NeedReturnFields"] = new JArray(),
            //                        //["IsDeleteEntry"] = "true",
            //                        //["SubSystemId"] = "",
            //                        //["IsVerifyBaseDataField"] = "false",
            //                        ["IsDeleteEntry"] = "true",
            //                        ["SubSystemId"] = "",
            //                        ["IsVerifyBaseDataField"] = "true",
            //                        ["IsEntryBatchFill"] = "false",
            //                        ["ValidateFlag"] = "true",
            //                        ["NumberSearch"] = "true",
            //                        ["IsAutoAdjustField"] = "false",
            //                        ["InterationFlags"] = "",
            //                        ["IgnoreInterationFlag"] = "",
            //                        //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
            //                        ["Model"] = model
            //                    };

                                var loginRet = InvokeHelper.Login();
                                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                                if (isSuccess == 0)
                                {
                                    oCn.RollBack();
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "登录金蝶失败！";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }
                                else
                                {                                   
                                    string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存
            //                    //从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
            //                    if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
            //                    {
            //                        oCn.RollBack();
            //                        objJsonResult.code = "0";
            //                        objJsonResult.count = 0;
            //                        objJsonResult.Message = "入库申请单同步获取登录账号密码失败！";
            //                        objJsonResult.data = null;
            //                        return objJsonResult;
            //                    }

                                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                    {
                                        LogService.Write(JsonConvert.SerializeObject(jsonRoot));
                                        oCn.RollBack();
                                        objJsonResult.code = "0";
                                        objJsonResult.count = 0;
                                        objJsonResult.Message = "入库申请单同步金蝶云失败！单号:" + HSourceBillNo + result + jsonRoot;
                                        objJsonResult.data = null;
                                        return objJsonResult;
                                    }
            //                    var loginRet = InvokeHelper.Login();
            //                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
            //                    if (isSuccess == 0)
            //                    {
            //                        oCn.RollBack();
            //                        objJsonResult.code = "0";
            //                        objJsonResult.count = 0;
            //                        objJsonResult.Message = "登录金蝶失败！";
            //                        objJsonResult.data = null;
            //                        return objJsonResult;
            //                    }
            //                    else
            //                    {                                   
            //                        string result = InvokeHelper.Save("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(jsonRoot));//保存

                                    //提交审核
                                    string result1 = string.Empty;
                                    string result2 = string.Empty;
                                    var fID = JObject.Parse(result)["Result"]["Id"].ToString();
                                    var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                    var json = new
                                    {
                                        Ids = fID,
                                    };
                                    if (oSystemParameter.omodel.Sc_ICMOReportBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
                                    {
                                        result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                                        result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//审核
            //                        if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                        {
            //                            LogService.Write(JsonConvert.SerializeObject(jsonRoot));
            //                            oCn.RollBack();
            //                            objJsonResult.code = "0";
            //                            objJsonResult.count = 0;
            //                            objJsonResult.Message = "入库申请单同步金蝶云失败！单号:" + HSourceBillNo + result + jsonRoot;
            //                            objJsonResult.data = null;
            //                            return objJsonResult;
            //                        }

                                        if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                        {
                                            oCn.RollBack();
                                            objJsonResult.code = "0";
                                            objJsonResult.count = 0;
                                            objJsonResult.Message = "入库申请单单号:" + ",提交失败" + result1;
                                            objJsonResult.data = null;
                                            return objJsonResult;
                                        }
            //                        //提交审核
            //                        string result1 = string.Empty;
            //                        string result2 = string.Empty;
            //                        var fID = JObject.Parse(result)["Result"]["Id"].ToString();
            //                        var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
            //                        var json = new
            //                        {
            //                            Ids = fID,
            //                        };
            //                        if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
            //                        {
            //                            result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//提交
            //                            result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//审核

                                        if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                        {
                                            oCn.RollBack();
                                            objJsonResult.code = "0";
                                            objJsonResult.count = 0;
                                            objJsonResult.Message = "入库申请单单号:" + ",审核失败" + result2;
                                            objJsonResult.data = null;
                                            return objJsonResult;
                                        }
                                    }
                                }
                            }
                        }
                    }
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
            //                            if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                            {
            //                                oCn.RollBack();
            //                                objJsonResult.code = "0";
            //                                objJsonResult.count = 0;
            //                                objJsonResult.Message = "入库申请单单号:" + ",提交失败" + result1;
            //                                objJsonResult.data = null;
            //                                return objJsonResult;
            //                            }

            //                            if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            //                            {
            //                                oCn.RollBack();
            //                                objJsonResult.code = "0";
            //                                objJsonResult.count = 0;
            //                                objJsonResult.Message = "入库申请单单号:" + ",审核失败" + result2;
            //                                objJsonResult.data = null;
            //                                return objJsonResult;
            //                            }
            //                        }
            //                    }
            //                }
            //            }
            //        }
            //    }
            //}
            //else
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}

            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);

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -229,6 +229,7 @@
                        var HMainSourceInterID = list[i]["源单主内码"].ToString();
                        var HMainSourceEntryID = list[i]["源单子内码"].ToString();
                        var HPlanQty = list[i]["计划数量"].ToString();
                        var HEmpID = list[i]["HEmpID"].ToString();

                        LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));

@@ -263,7 +264,7 @@
                            " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate)values" +
                            ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
@@ -271,7 +272,7 @@
                            $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}')";
                            $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}')";

                        //LogService.Write("sql:" + sql);
                        //主表

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillListController.cs

@@ -82,6 +82,71 @@
            }
        }
        #endregion

        /// <summary>
        /// ä½œä¸šæŒ‡å¯¼ä¹¦åˆ é™¤
        /// </summary>
        /// <returns></returns>
        [Route("Gy_SOPBill/Del")]
        [HttpGet]
        public object Del(string hmainid, string hsubid, string user)
        {
            DataSet ds;
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_SOPBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(hmainid))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "资料内码为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_SOPBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid, "Gy_SOPBillSub");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                oCN.RunProc("delete Gy_SOPBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);
                oCN.RunProc("delete Gy_SOPBillSub2 where HInterID=" + hmainid + " and HEntryID=" + hsubid);
                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "作业指导书删除成功！";
                objJsonResult.data = null;
                return objJsonResult; ;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #region å¼•å‡º
        [Route("Gy_SOPBill/SetExcel")]
        [HttpGet]
@@ -207,7 +272,6 @@
            return response;
        }
        #endregion


        //
        private Int32 Fun_GetCol(string sCol)