添康问题修复

llj

1 天以前 c2e1c48be08582aa7bdb5a42ce25d60f7c7320aa

添康问题修复

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -3233,12 +3233,12 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain");
                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> '' and HPrintQty>0", "Gy_MouldFileMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！单据已审核！";
                    objJsonResult.Message = "删除失败！单据已审核或已被打印！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

 WebAPI/Controllers/MateOutController.cs

@@ -1635,7 +1635,7 @@

        #endregion

        //车间定位  è½¦é—´ä¸Šä¸‹æž¶æ—¶é—´æŸ¥è¯¢
        #region è½¦é—´å®šä½  è½¦é—´ä¸Šä¸‹æž¶æ—¶é—´æŸ¥è¯¢
        [Route("Kf_WorkShopICStockBill/List")]
        [HttpGet]
        public object Kf_WorkShopICStockBillList(string HBillType, string HCarBarCode, string HProcExBillNo, string HMaterNumber, long HWHID, long HSPID, string sWhere)
@@ -1685,7 +1685,7 @@
                return objJsonResult;
            }
        }

        #endregion
        [Route("MateOutBill/Delete_Json")]
        [HttpGet]
        public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -3997,5 +3997,60 @@
        #endregion
        #endregion



        #region è½¦é—´å®šä½  è½¦é—´ä¸Šä¸‹æž¶æ—¶é—´æŸ¥è¯¢
        [Route("KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList")]
        [HttpGet]
        public object KF_ICInventory_WorkShopList(string sWhere)
        {// string HBarCode, string HMaterNumber, long HWHID, long HSPID, 
            try
            {
                DataSet ds;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> columnNameList = new List<object>();
                if (sWhere != null)
                {
                    //sWhere = sWhere.Replace("'", "''");
                    ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1 "+ sWhere, "h_v_KF_ICInventory_WorkShop_WMS");
                }
                else
                 ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1", "h_v_KF_ICInventory_WorkShop_WMS");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -5250,6 +5250,28 @@
                }
                else
                {

                    //删除前控制=========================================
                    DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString()  , "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");

                    if (dds == null)
                    {
                        oCn.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除前判断失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(dds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        oCn.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //更新车间物料库存
                    oCn.RunProc("EXEC h_p_WMS_UPDateICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "'");
                    //更新车间条码库存