From 105bb5f0f4edd01d8f915ffda28ccd37afbfddc8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 四月 2023 08:29:41 +0800
Subject: [PATCH] 基础资料 添加校验控制 进站单出站单扫完流转卡默认带出最大工序汇报数量（获取 上一道的 合格数量（如果拆分后，上道合格数量大于流转卡数量时，仍取流转卡数量），如果是第一道则获取流转卡数量） 拆卡必须最大工序出站之后才允许拆卡，汇报过的工序拆卡出来不需要显示 增加生产订单 复制功能； 流转卡添加复制功能 工艺路线 增加 上一行 下一行 刷新流水号 按钮功能， 可以调整 工序上下次序； 以及重新刷新流水号
---
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index d0729e0..e168699 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -32,50 +32,50 @@
try
{
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn(sql1, "h_v_IF_EntrustOrderBillList");
- }
- else
- {
- ds = oCN.RunProcReturn(sql1+ sWhere, "h_v_IF_EntrustOrderBillList");
- }
-
- ////鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- //bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
- //if (!isCgjl)
+ //if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
//{
- // sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
//}
- //string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
- //ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
- if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ //string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
+ //if (sWhere == null || sWhere.Equals(""))
+ //{
+ // ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
+ //}
+ //else
+ //{
+ // ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
+ //}
+
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
+ if (!isCgjl)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺褰�";
- objJsonResult.data = null;
- return objJsonResult;
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
+
+ //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