From af6e1e7da3131b268b035401aeb75a6bab83f312 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 五月 2023 09:10:12 +0800
Subject: [PATCH] 末道工序入库时,可入库数量得等于出站汇报单数量,要是可入库数量小于汇报数量,则保存汇报单失败,报错提示,匹配生产汇报单数量不足出站数量,不允许入库。 --首道出站单删除的时候判断一下对应的金蝶云生产汇报单是否删除,要是没有删除本地出站单也不允许删除 --末道出站单删除的时候判断一下对应的金蝶云生产入库单是否删除,要是没有删除本地出站单也不允许删除 工序流转卡号改成年+月+四位流水号(23050001) 角色对应权限 设置功能 完善;

---
 WebAPI/Controllers/Kf_ICStockBillMainController.cs |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index c6cbca8..c1d9d6b 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -36,29 +36,30 @@
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1 order by hmainid desc", "h_v_IF_Kf_ICStockBillMain");
                 }
                 else
                 {
-                    string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere;
+                    string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
                 }
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
-                }
+
+                //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 e)
             {

--
Gitblit v1.9.1