parent: 16bb2f7b | 补丁 | 提交 | ignore whitespace
yangle
2022-11-01 5203832a2163943f6858a6f3ed66727b3ac6a037 
投产计划报表 修改
3个文件已修改
62 ■■■■■ 已修改文件
WebAPI/Controllers/CJGL/ProductionPlanReportController.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodBill_ZXBZController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/CJGL/ProductionPlanReportController.cs


@@ -30,6 +30,8 @@


            public string F_BSV_WYID;


            public string HBillNo;


            public string HMaterNumber;


            public int IsTrue;


            public int HState;


        }


        [Route("ProductionPlanReport/ProductionPlanReportList")]


        [HttpGet]


@@ -41,7 +43,7 @@


                ProductionPlanReport com = JsonConvert.DeserializeObject<ProductionPlanReport>(sWhere.ToString());




                ds = oCN.RunProcReturn($"exec h_p_Cj_ProductionPlanReportList {com.HOrgID},'{com.HBeginDate}','{com.HEndDate}'" +


                    $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.F_BSV_WYID}','{com.HMaterNumber}','{com.HBillNo}'", "h_p_Cj_ProductionPlanReportList");


                    $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.F_BSV_WYID}','{com.HMaterNumber}','{com.HBillNo}',{com.IsTrue},'{com.HState}'", "h_p_Cj_ProductionPlanReportList");




                objJsonResult.code = "1";


                objJsonResult.count = 1;




 WebAPI/Controllers/SCGL/Sc_ComplementGoodBill_ZXBZController.cs


@@ -176,7 +176,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "库存数量为0,无法叫料!";


                            objJsonResult.Message = $"第{(i + 1)}行库存数量为0,无法叫料!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -185,7 +185,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "库存数量小于叫料数量,无法叫料!";


                            objJsonResult.Message = $"第{(i+1)}行调出仓库可用库存数量小于叫料数量,无法叫料!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -194,7 +194,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "请选择调入仓库!";


                            objJsonResult.Message = $"第{(i + 1)}行请选择调入仓库!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -203,7 +203,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "请选择调出仓库!";


                            objJsonResult.Message = $"第{(i + 1)}行请选择调出仓库!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -212,7 +212,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "调出仓库和调入仓库不能一样!";


                            objJsonResult.Message = $"第{(i + 1)}行调出仓库和调入仓库不能一样!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }




 WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs


@@ -376,8 +376,6 @@


            ds = oCN.RunProcReturn("exec JIT_SendGoodsBillSynChronizAtion '" + HBillNo + "'", "JIT_SendGoodsBillSynChronizAtion");


            if (ds.Tables[0].Rows.Count != 0)


            {






                foreach (DataRow dr in ds.Tables[0].Rows)


                {


                    JObject model = new JObject();


@@ -434,15 +432,7 @@


                        return objJsonResult;


                    }


                    var result = InvokeHelper.Save("STK_TransferDirect", jsonRoot.ToString());


                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")


                    {


                        objJsonResult.code = "1";


                        objJsonResult.count = 1;


                        objJsonResult.Message = null;


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    else


                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")


                    {


                        oCN.RollBack();


                        objJsonResult.code = "0";


@@ -451,6 +441,42 @@


                        objJsonResult.data = null;


                        return objJsonResult;


                    }




                    var json = new


                    {


                        Numbers = HBillNo,


                    };


                    //提交


                    var _result = InvokeHelper.Submit("STK_TransferDirect", JsonConvert.SerializeObject(json));


                    var _saveObj = JObject.Parse(_result);


                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")


                    {


                        LogService.Write("收料通知单提交失败jsonRoot:" + jsonRoot.ToString());


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "金蝶收料通知单提交失败" + _result;


                        objJsonResult.data = null;


                        return objJsonResult;




                    }


                    //审核


                    _result = InvokeHelper.Audit("STK_TransferDirect", JsonConvert.SerializeObject(json));


                    _saveObj = JObject.Parse(_result);


                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")


                    {


                        LogService.Write("收料通知单审核失败jsonRoot:" + jsonRoot.ToString());


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "金蝶收料通知单审核失败jsonRoot" + _result;


                        objJsonResult.data = null;


                        return objJsonResult;


                    }




                    objJsonResult.code = "1";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "操作成功！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


            }


            else