From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:25 +0800
Subject: [PATCH] 工序流转卡  工艺参数 应该 可编辑; 1.生产资源 有异常; 删除有问题,删除后出来 异常数据(  );    其他信息 里的  几个字段 输入 字符时 报错,应提示; 2.工序 :  9999的 转工序 , 有个 转工序 字段,是否没显示出来; 其他信息 里的  几个字段 输入 字符时 报错,应提示; 3.工作中心:  其他信息 里的  几个字段 输入 字符时 报错,应提示; 4.生产班组: 刷新出来 异常数据;    其他信息 里的  几个字段 输入 字符时 报错,应提示; 5.基础资料的  一些 复选框 标题不对; 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑; 7.工艺路线查询;工序号,工序代码,工序,工艺参数,表体备注, 其他的放后面  子表 的 委外标记 放到最后面去; 并且 把  供应商代码和供应商 放出来(也放在最后几个); 8.部门有 很多异常数据;   选择的时候 出来了; 9.流转卡维护, 表头 很多没有用的列,单据号 日期 都没有显示;     转工序 是否要打印(跟客户确认); 10. 流转卡拆分时,一些 列的 排序;

---
 WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs |   90 +++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
index c2d9913..7e406a4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
@@ -27,73 +27,51 @@
         /// <returns></returns>
         [Route("Gy_BarCodeBillList/Sub_DeleteBill")]
         [HttpGet]
-        public object Sub_DeleteBill(long HInterID)
+        public object Sub_DeleteBill(long HInterID, string HBarCode)
         {
-            //缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
-
-
-            Int64 lngBillKey = 0;
-            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
-            if (lngBillKey == 0)
+            DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
+            if (oBill.DeleteBill(HInterID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                 objJsonResult.data = null;
                 return objJsonResult;
             }
-            DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
-            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
-            {
-                if (oBill.omodel.HBillStatus > 1)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                if (oBill.omodel.HChecker != "")
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-
-                bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-                if (IsDete)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-            }
             else
+            {
+                //鍒犻櫎鎴愬姛
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 鏉$爜妗f鍒楄〃鎵归噺鍒犻櫎鍔熻兘
+        /// </summary>
+        /// <returns></returns>
+        [Route("Gy_BarCodeBillList/Sub_MulDeleteBill")]
+        [HttpGet]
+        public object Sub_MulDeleteBill(string sInterID, string sBarCode)
+        {
+            DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
+            if (oBill.MulDeleteBill(sInterID, sBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            else
+            {
+                //鍒犻櫎鎴愬姛
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                 objJsonResult.data = null;
                 return objJsonResult;
             }

--
Gitblit v1.9.1