chenhaozhe
2026-01-29 8e55450074db98dd91318cae7fd2f0b4cb194448
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1707,9 +1707,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                {
                 {
                    string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                             join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                             join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1717,7 +1716,7 @@
                             where e.HItemID ='" + HKeeperID + "' ";
                    //查询质检员对应质检部门
                    ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                    LogService.Write("sql" + sql);
                    // LogService.Write("sql" + sql);
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
@@ -1737,7 +1736,6 @@
                model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织
                model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门
                if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                {
                    model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
@@ -1782,7 +1780,21 @@
                FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //基本单位数量
                FentityModel2.Add("FUsePolicy", HUseResult.ToString());   //使用决策
                FentityModel2.Add("FIsCheck", false);   //是否抽检
                FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                // 锦隆启用不良处理
                if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                {
                    // 判断单据是否合格
                    if (HCheckResult.ToString() == "2")
                    {
                        FentityModel2.Add("FIsDefectProcess", true);  //不良处理
                    }else
                    {
                        FentityModel2.Add("FIsDefectProcess", false);
                    }
                }else
                {
                    FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                }
                FentityModel2.Add("FCanSale", false);   //可销售
                FentityModel2.Add("FIsMRBReview", false);   //MRP评审
                FentityModel2.Add("FIsReturn", true);   //判退
@@ -1861,13 +1873,13 @@
                    Ids = fID,
                };
                K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
                //        K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
                result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
@@ -1896,14 +1908,14 @@
                        //文件IO流
                        string a = Convert.ToBase64String(buffer);
                        //if(oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                        //{
                        if(oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                        {
                            ds = oCN.RunProcReturn("select * from  JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        //else
                        //{
                        //    ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        }
                        else
                        {
                            ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        }
                        HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
@@ -1921,7 +1933,7 @@
                        string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
                        LogService.Write("json:" + jsonStr);
                        LogService.Write("_vlog:" + _vlog);
                        if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                        {
                            oCN.RollBack();