111

王 垚

2023-02-01 c9bed37a4a8186b71564c9fc8c77934c5839f912

111

 WebAPI/Controllers/BarCodeController.cs

@@ -13,6 +13,8 @@
using System.Web.Script.Serialization;
using WebAPI.Code;
using WebAPI.Models;
using WebAPI.Utility;

namespace WebAPI.Controllers
{

@@ -1456,15 +1458,12 @@
        /// <summary>
        /// 条码生成表体（采购订单）
        /// </summary>
        /// <param name="sMsg"></param>
        /// <param name="sMsg">采购订单HinterID</param>
        /// <returns></returns>
        public object GetHBarCodeShowBillSubBycg(string sMsg)
        {
            try
            {
                DataSet ds;
                string s = "";
                string ShowItem = " * ";//显示的字段
                if (DBUtility.ClsPub.isLong(sMsg) == 0)
                {
                    objjson.code = "0";
@@ -1473,9 +1472,18 @@
                    objjson.data = null;
                    return objjson;
                }
                //预处理 修改采购订单的退料数量
                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
                string sql = $@"update t1 set 
 t1.HMrbQty = t2.FMRBQTY
 from Cg_POOrderBillSub t1 
 join {kdTbaleName}..T_PUR_POORDERENTRY_R t2 
 on t1.HEntryID = t2.FENTRYID
 where t1.HInterID = {sMsg} ";//sMsg 采购订单hinterid
                oCn.RunProc(sql);
                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
                string sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);
                ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");
                sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);
                DataSet ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");
                //ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
@@ -1518,8 +1526,8 @@
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg2 = sArray[0].ToString();//
            string msg3 = sArray[1].ToString();// 
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
@@ -1567,7 +1575,7 @@
                    if (oItemSub.HQty == 0 || oItemSub.HMinQty == 0 || oItemSub.HWXQty == 0)
                        continue;
                    //检验打印数量（HQTY）和未打印数量
                    string sql = $"select HQty -HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
                    string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
                    DataSet ds = oCn.RunProcReturn(sql, "tables");
                    if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
                    {

 WebAPI/Controllers/POInStockController.cs

@@ -1193,7 +1193,7 @@
                    oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID}");
                }
                //判断未关联数量是否为0
                DataSet ds = oCn.RunProcReturn($"select hqty-hrelationqty as hqty from Cg_POOrderBillSub where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty as hqty,单据号,物料编码 from H_v_SRM_POOrderBillList t1  where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
                DataTable dt = ds.Tables[0];
                if (dt.Rows.Count > 0)
                {
@@ -1202,7 +1202,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = $"请检查数据，单据号：{dr[0]["单据号"]},物料代码：{dr[0]["物料代码"]},未发货数量为0，已全部生成送货单！";
                        objJsonResult.Message = $"请检查数据，单据号：{dr[0]["单据号"]},物料编码：{dr[0]["物料编码"]},可以发货数量为0，已全部生成送货单！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }