Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

杨乐

2022-03-15 b590f1374c4e48133a17c77bac8e9797811975ee

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs

@@ -383,12 +383,13 @@
        #region ç›˜ç‚¹åˆ†æžå®¡æ ¸
        #region è°ƒæ‹¨â€”直接调拨
        [Route("Gy_StockCheckItemBill/MakeProdMove")]
        [HttpGet]
        public object MakeProdMove(string msg)
        [HttpPost]
        public object MakeProdMove([FromBody] JObject msg)
        {
            try
            {
                string msg1 = msg.ToString();
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();//表格数据
                string user = sArray[1].ToString();//user
@@ -439,8 +440,9 @@
                    oCn.RunProc(sql);
                    oCn.RunProc(sql1);
                    oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
                    oCn.Commit();
                }
                oCn.Commit();
                
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "审核成功！";
@@ -464,12 +466,13 @@

        #region ç›˜ç›ˆâ€”其他入库单
        [Route("Gy_StockCheckItemBill/MakeOtherIn")]
        [HttpGet]
        public object MakeOtherIn(string msg)
        [HttpPost]
        public object MakeOtherIn([FromBody] JObject msg)
        {
            try
            {
                string msg1 = msg.ToString();
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();//表格数据
                string user = sArray[1].ToString();//user
@@ -503,23 +506,26 @@
                    ") " +
                    " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
                    ", '" + user + "',getdate()" +
                    ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
                    ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
                    ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
                    ", 0," + dr["HDeptID"].ToString() + ",'',0" +
                    ") ";
                
                    string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub   (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
                    HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
                    HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
                    HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
                    "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
                    "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
                    "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'" + dr1["HCorrespondentID"].ToString() + "',isnull('" + dr["HNowSupID"].ToString() + "',0),0,0"
                    + ",0,0,0," + userID + ",0,100005,'')");
                   
                    //主表
                    oCn.BeginTran();
                    oCn.RunProc(sql);
                    oCn.RunProc(sql1);
                    oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
                    oCn.Commit();
                }
                oCn.Commit();
                
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "审核成功！";
@@ -543,13 +549,13 @@

        #region ç›˜äºâ€”处理出库单
        [Route("Gy_StockCheckItemBill/MakeScrapOut")]
        [HttpGet]
        public object MakeScrapOut(string msg)
        [HttpPost]
        public object MakeScrapOut([FromBody] JObject msg)
        {
            try
            {
                //var _value = msg["msg"].ToString();
                string msg1 = msg.ToString();
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();//表格数据
                string user = sArray[1].ToString();//user
@@ -599,8 +605,8 @@
                    oCn.RunProc(sql);
                    oCn.RunProc(sql1);
                    oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
                    oCn.Commit();
                }
                oCn.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "审核成功！";
@@ -624,13 +630,13 @@

        #region å‡ºåº“—领用出库单
        [Route("Gy_StockCheckItemBill/MakeProdOut")]
        [HttpGet]
        public object MakeProdOut(string msg)
        [HttpPost]
        public object MakeProdOut([FromBody] JObject msg)
        {
            try
            {
                //var _value = msg["msg"].ToString();
                string msg1 = msg.ToString();
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();//表格数据
                string user = sArray[1].ToString();//user
@@ -680,8 +686,9 @@
                    oCn.RunProc(sql);
                    oCn.RunProc(sql1);
                    oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
                    oCn.Commit();
                }
                oCn.Commit();
                
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "审核成功！";
@@ -704,12 +711,12 @@

        #region é€€åº“—领用退库单
        [Route("Gy_StockCheckItemBill/MakeProdBack")]
        [HttpGet]
        public object MakeProdBack(string msg)
        [HttpPost]
        public object MakeProdBack([FromBody] JObject msg)
        {
            try
            {//var _value = msg["msg"].ToString();
                string msg1 = msg.ToString();
            {   var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();//表格数据
                string user = sArray[1].ToString();//user
@@ -759,8 +766,9 @@
                    oCn.RunProc(sql);
                    oCn.RunProc(sql1);
                    oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
                    oCn.Commit();
                }
                oCn.Commit();
                
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "审核成功！";
@@ -784,8 +792,8 @@

        #region å…ˆé¢†ç”¨é€€åº“再领用出库
        [Route("Gy_StockCheckItemBill/MakeProdOutBack")]
        [HttpGet]
        public object MakeProdOutBack(string msg)
        [HttpPost]
        public object MakeProdOutBack([FromBody] JObject msg)
        {
            MakeProdBack(msg);
            MakeProdOut(msg);