From 63610047f4921b0bdcb0042f54c5197b62746446 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 八月 2023 14:28:42 +0800
Subject: [PATCH] 异常工时申请单：添加子表重复校验，子表做颜色区分，子表单元格根据宽度隐藏内容，取消分页，添加合计行，根据职员带出工作中，取消上一行下一行
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESStopStepWorkBillController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
index 3c2fc28..a277c72 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESStopStepWorkBillController.cs"
@@ -46,14 +46,15 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_MESStopWorkBillList_NEW " + sWhere, "h_v_Sc_MESStopWorkBillList_NEW");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MESStopWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESStopWorkBillList_NEW");
}
else
{
string sql1 = "select * from h_v_Sc_MESStopWorkBillList_NEW where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_MESStopWorkBillList_NEW");
}
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
--
Gitblit v1.9.1