From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 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_MESReturnStepWorkBillController.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_MESReturnStepWorkBillController.cs"
index 6ed5f79..4e7ab44 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_MESReturnStepWorkBillController.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_MESReturnStepWorkBillController.cs"
@@ -40,6 +40,7 @@
{
ds = Sc_GetMESReturnStepWorkBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -60,17 +61,52 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESReturnWorkBillList_NEW ", "h_v_Sc_MESReturnWorkBillList_NEW");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESReturnWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESReturnWorkBillList_NEW");
}
else
{
string sql1 = "select * from h_v_Sc_MESReturnWorkBillList_NEW where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hmainid desc ";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESReturnWorkBillList_NEW");
}
}
+ #endregion
+
+ #region 鑾峰彇杩斿伐宸ュ簭涓嬫媺妗嗘暟鎹�(鎵�鏈夊伐搴�)
+ [Route("Sc_MESReturnStepWorkBill/GetMESReturnStepSelectBill")]
+ [HttpGet]
+ public object GetMESReturnStepSelectBill()
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select HItemID,宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О from h_v_Gy_ProcessList ", "h_v_Gy_ProcessList");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲伐搴忔暟鎹�,璇风淮鎶わ紒";
+ objJsonResult.data =null;
+ }
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region[杩斿伐鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
@@ -101,7 +137,7 @@
{
DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -183,19 +219,19 @@
[HttpGet]
public object AuditReturnStepProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "Sc_ProcessPlan_Check";
+ string ModRightNameCheck = "Sc_ReturnStepProcess_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HInterID <= 0)
{
objJsonResult.code = "0";
@@ -330,7 +366,7 @@
DBUtility.ClsPub.CurUserName = UserName;
//淇濆瓨鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, false, DBUtility.ClsPub.CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1