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/OtherInStockController.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index f66269e..697bc26 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -167,6 +167,7 @@
         {
             try
             {
+
                 string sErrMsg = "";
                 bool sBool = false;
                 oView = webserver.get_InfoByBarCode_Source(sBarCode, sInterID, ref sBool, ref sErrMsg);
@@ -233,6 +234,8 @@
             string msg1 = _value.ToString();
             try
             {
+                
+               
                 List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
                 ListModels oListModels = new ListModels();
                 lsmain = oListModels.getICStockBillMainByJson(msg1);
@@ -336,8 +339,8 @@
                 List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
                 ListModels oListModels = new ListModels();
                 lsmain = oListModels.getOtherInBillMainByJson(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_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
@@ -352,6 +355,7 @@
                 websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
                 websLsmain.HKeeperID = lsmain[0].HKeeperID;
                 websLsmain.HBillType = "1203";//鍥哄畾鍊�
+                websLsmain.HBillSubType = lsmain[0].HBillSubType;
 
                 WebS.WebService1 oWebs = new WebS.WebService1();
                 WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
@@ -359,7 +363,7 @@
                 {            
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //鎴愬姛锛�
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -367,7 +371,8 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //澶辫触锛�
+                    //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1