From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删除； 生产资源新增模块增加 负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表） 网格选中行， 背景行 浅蓝色 显示；（优先改 生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）
---
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index a7baf96..598cfba 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -29,7 +29,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -136,7 +136,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -239,7 +239,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -322,7 +322,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -408,7 +408,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -418,22 +418,23 @@
}
ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization);
- if (ds == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- 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 ex)
{
@@ -450,11 +451,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList");
}
else
{
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
}
--
Gitblit v1.9.1