维护

yangle

2022-08-16 5db884aac7beaac546470f9aa91731cd79961fee

 WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs

@@ -64,8 +64,6 @@
                ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
                    $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");

                //bool a = AddSendGoodsBillSynChronizAtion("PLD00000114", ref DBUtility.ClsPub.sExeReturnInfo);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
@@ -273,7 +271,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "调拨单生成失败";
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -294,15 +292,11 @@
            {
                oCN.BeginTran();

                ds = oCN.RunProcReturn($"select a.HMainSourceEntryID,b.HMaterID  from JIT_SendGoodsBillMain a  with(nolock) inner join JIT_SendGoodsBillSub b with(nolock) on a.HInterID = b.HInterID where a.HMainSourceInterID={SourceInterID} and a.HBillStatus=1", "JIT_SendGoodsBillMain");

                long InterID = 0;
                string HBillNo = "";
                for (int i = 0; i < listCa.Count; i++)
                {
                    // 则代表配送单没有数据  需要添加数据
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                   
                        if (i == 0)
                        {
                            InterID = DBUtility.ClsPub.CreateBillID_Prod("460201", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -321,13 +315,7 @@
                            ",HMaterID,HQty,HWHID,HSPID,HISCheck,HCheckSubMan,HCheckSubDate,HStockOutOrgID,HStockInOrgID,HSCWHID)" +
                            $"values({InterID},'{HBillNo}',{i + 1}, {listCa[i].HMaterID},{listCa[i].本次拣料数量}," +
                            $" {listCa[i].HWHID},{listCa[i].HSPID},0,'{user}', GETDATE(),{listCa[i].HStockOutOrgID},{listCa[i].HStockInOrgID},{listCa[i].HSCWHID})");
                    }
                    else
                    {
                        //修改配送单的配送数量
                        oCN.RunProc($"update b  set b.HQty=b.HQty+{listCa[i].本次拣料数量} from JIT_SendGoodsBillMain a  with(nolock) inner join JIT_SendGoodsBillSub b with(nolock) on a.HInterID = b.HInterID  " +
                            $"where  HMainSourceInterID ={SourceInterID} and b.HMaterID ={listCa[i].HMaterID} and a.HBillStatus =1 ");
                    }
                 

                    DataSet dsTable = new DataSet();
                    //查询JIT_ComplementGoodsBillSub_LK
@@ -359,6 +347,7 @@
                    }
                }

                //同步金蝶直接调拨单
                objJsonResult = AddSendGoodsBillSynChronizAtion(HBillNo);

                oCN.Commit();
@@ -375,7 +364,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = null;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -396,6 +385,9 @@
        public json AddSendGoodsBillSynChronizAtion(string HBillNo)
        {
            ds = oCN.RunProcReturn("exec JIT_SendGoodsBillSynChronizAtion '" + HBillNo + "'", "JIT_SendGoodsBillSynChronizAtion");
            if (ds.Tables[0].Rows.Count != 0)
            {


            foreach (DataRow dr in ds.Tables[0].Rows)
            {
@@ -403,12 +395,12 @@
                model.Add("FBillTypeID", new JObject() { ["Fnumber"] = dr["FBillTypeID"].ToString() }); //单据类型
                model.Add("FDate", dr["FDate"].ToString());
                model.Add("FBILLNO", dr["FBILLNO"].ToString());
                model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FStockOrgId"].ToString() });
                    model.Add("FStockOrgId", new JObject() { ["Fnumber"] = ds.Tables[1].Rows[0]["FStockOrgId"].ToString() });
                model.Add("FOwnerTypeIdHead", dr["FOwnerTypeIdHead"].ToString());
                model.Add("FTransferBizType", dr["FTransferBizType"].ToString());
                    model.Add("FTransferBizType", ds.Tables[1].Rows[0]["FTransferBizType"].ToString());
                model.Add("FOwnerTypeOutIdHead", dr["FOwnerTypeOutIdHead"].ToString());
                model.Add("FTransferDirect", dr["FTransferDirect"].ToString());
                model.Add("FStockOutOrgId", new JObject() { ["Fnumber"] = dr["FStockOutOrgId"].ToString() });
                    model.Add("FStockOutOrgId", new JObject() { ["Fnumber"] = ds.Tables[1].Rows[0]["FStockOutOrgId"].ToString() });

                JArray Fentity = new JArray();
                foreach (DataRow item in ds.Tables[1].Rows)
@@ -470,8 +462,17 @@
                    return objJsonResult;
                }
            }
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "调拨单已经存在,无法生成!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            objJsonResult.code = "0";
            objJsonResult.count = 0;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;