器具管理维护

yangle

2022-12-30 e69dfa27e62cf31380576ae275a812ece2cf20f9

器具管理维护

 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs

@@ -690,9 +690,9 @@
        #endregion

        #region å™¨å…·é‡‡è´­å…¥åº“单审核/反审核
        [Route("Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill")]
        [Route("Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills")]
        [HttpGet]
        public object AuditMouldProdInHouseBill(string HInterID, string user, int flag)
        public object AuditMouldProdInHouseBills(string HInterID, string user, int flag)
        {
            //flag=1 å®¡æ ¸ï¼›  flag=2 åå®¡æ ¸
            //编辑权限

 WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs

@@ -601,7 +601,7 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
            DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
            DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                if (flag == 1)

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -3855,7 +3855,7 @@
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性名称 HPropertyName,
                                            HSecUnitID, è¾…助计量单位代码 HSecUnitCode, è¾…助计量单位名称 HSecUnitName, HUnitID, è®¡é‡å•ä½ä»£ç  HUnitCode, è®¡é‡å•ä½åç§° HUnitName, æ‰¹æ¬¡ HBatchNo,
                                            è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ä½¿ç”¨å¯¿å‘½ HUseLife, å®žæ”¶æ•°é‡ HQty, å•ä»· HPrice, é‡‘额 HMoney, HWHID, æ”¶æ–™ä»“库代码 HWHCode, æ”¶æ–™ä»“库名称 HWHName,
                                            HSPID, ä»“位代码 HSPCode, ä»“位名称 HSPName, å¤‡æ³¨ HRemark,HStockOrgID
                                            HSPID, ä»“位代码 HSPCode, ä»“位名称 HSPName, å­å¤‡æ³¨ HRemark,HStockOrgID
                                            FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");

                }
@@ -3866,7 +3866,7 @@
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性名称 HPropertyName,
                                            HSecUnitID, è¾…助计量单位代码 HSecUnitCode, è¾…助计量单位名称 HSecUnitName, HUnitID, è®¡é‡å•ä½ä»£ç  HUnitCode, è®¡é‡å•ä½åç§° HUnitName, æ‰¹æ¬¡ HBatchNo,
                                            è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ä½¿ç”¨å¯¿å‘½ HUseLife, å®žæ”¶æ•°é‡ HQty, å•ä»· HPrice, é‡‘额 HMoney, HWHID, æ”¶æ–™ä»“库代码 HWHCode, æ”¶æ–™ä»“库名称 HWHName,
                                            HSPID, ä»“位代码 HSPCode, ä»“位名称 HSPName, å¤‡æ³¨ HRemark,HStockOrgID
                                            HSPID, ä»“位代码 HSPCode, ä»“位名称 HSPName, å­å¤‡æ³¨ HRemark,HStockOrgID
                                            FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");

 WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs

@@ -109,9 +109,8 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();

            int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
            int OperationType = int.Parse(sArray[3].ToString());//数据类型 1添加 3修改
            string msg4 = sArray[4].ToString();
            int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改
            string msg4 = sArray[3].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Edit", 1, false, msg4))
@@ -183,10 +182,10 @@
                " where HInterID=" + omodel.HInterID.ToString());

                    //删除子表
                    oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
                    oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "'");
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, hentryid);
                objJsonResult = AddBillSub(msg3);
                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
@@ -212,7 +211,7 @@
            }
        }

        public json AddBillSub(string msg3, int hentryid)
        public json AddBillSub(string msg3)
        {
            DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_MouldRepairWorkBillSub>>(msg3);
            int i = 1;
@@ -224,7 +223,7 @@
                   ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                   ",HRepairID,HRepairExplanation,HManagerID,HMoney" +
                   ") values("
                   + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                   + omodel.HInterID.ToString() + "," + (i) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                   "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                   "," + oSub.HRepairID.ToString() + ",'" + oSub.HRepairExplanation + "'," + oSub.HManagerID.ToString() + "," + oSub.HMoney.ToString() +
                   ") ");

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

@@ -27,22 +27,12 @@
            {
                ds = StockCheckItemList(sWhere);

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {
@@ -56,7 +46,7 @@

        public static DataSet StockCheckItemList(string sWhere)
        {
            string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList");
            string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList where 1=1 ");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_StockCheckItemList");