From 2fe70195e1d6334ef74a5d0ad7dee89b28ae6092 Mon Sep 17 00:00:00 2001 From: cwjbxqmz <1134865194@qq.com> Date: 星期四, 12 十月 2023 09:54:59 +0800 Subject: [PATCH] 1.采购退料单维护:增加 审核,反审核,关闭,反关闭,作废,反作废、条码明细、列设置,按钮设置 等 按钮;其他入库单维护、生产入库单维护: 增加 作废,反作废、条码明细 等 按钮; 委外加工入库单维护: 增加 关闭,反关闭,作废,反作废 等 按钮; 生产退库单维护、分布式调入单维护: 增加 关闭,反关闭,作废,反作废、条码明细 等 按钮; 2.增加 领用申请单 单据新增编制 模块;增加 领用申请单列表 单据列表 模块; --- WebAPI/Controllers/POStockInBillController.cs | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs index ec68edf..923ccbe 100644 --- a/WebAPI/Controllers/POStockInBillController.cs +++ b/WebAPI/Controllers/POStockInBillController.cs @@ -995,12 +995,12 @@ bool flag3 = dataSet5.Tables[0].Rows.Count > 0; if (!flag3) { - POStockInBillController postockInBillController = new POStockInBillController(); - //鎵簮鍗曟柟娉� - postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); + //POStockInBillController postockInBillController = new POStockInBillController(); + ////鎵簮鍗曟柟娉� + //postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); - //WEBSController webscontroller4 = new WEBSController(); - //object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo); + WEBSController webscontroller4 = new WEBSController(); + object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID); @@ -1066,8 +1066,11 @@ bool flag4 = dataSet6.Tables[0].Rows.Count > 0; if (!flag4) { - POStockInBillController postockInBillController2 = new POStockInBillController(); - postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); + //POStockInBillController postockInBillController2 = new POStockInBillController(); + //postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo); + + WEBSController webscontroller4 = new WEBSController(); + object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID); } } } @@ -3918,8 +3921,8 @@ List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>(); ListModels oListModels = new ListModels(); lsmain = oListModels.getPOStockInBillMainByJson(msg1); - lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); - lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); string sSourceBillType = lsmain[0].HBillType; WebAPI.WebS.ClsKf_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain(); -- Gitblit v1.9.1