From f3f778dc992cde6451139f647dff99c89ef96063 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 16 三月 2023 14:01:58 +0800
Subject: [PATCH] 直接调拨单扫码上传生成金蝶云单据调用方法，屏蔽安瑞的上传前判断
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index ade9d19..95da203 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -179,15 +179,15 @@
case "SBM"://璁惧鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_EquipMentList where HItemID = '" + BillNo + "'", "h_v_Gy_EquipMentList");
break;
- case "JYM"://鍛樺伐鐮�
- ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
+ case "JYM"://鍛樺伐鐮�--妫�楠屽憳
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
break;
- case "GRM"://鍛樺伐鐮�
- ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
+ case "GRM"://鍛樺伐鐮�--鎿嶄綔鍛橈紝鎺ユ敹浜�
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
break;
- case "CGM"://鍛樺伐鐮�
- ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
- break;
+ //case "CGM"://鍛樺伐鐮�
+ // ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
+ // break;
case "HWH"://浠撳簱鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_WareHouseList where 鏉＄爜缂栧彿 = '" + HBarCode + "'", "h_v_Gy_WareHouseList");
break;
@@ -205,7 +205,7 @@
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
//绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
- if (oSystemParameter.omodel.MES_StationBill_ProcNoByUser == "Y")
+ if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
{
ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 = '" + UserID + "'", "h_v_Gy_ProcessList_GetProcNoByUser");
}
@@ -271,7 +271,7 @@
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
//绯荤粺鍙傛暟鏄惁涓鸿嚜鍔ㄥ尮閰嶆祦姘村彿,N涓烘墜鍔ㄨ緭鍏ワ紝Y涓鸿嚜鍔ㄥ尮閰�
- if (oSystemParameter.omodel.MES_StationBill_ProcNo == "Y")
+ if (oSystemParameter.omodel.MES_StationOutBill_ShowUSERProcess == "Y")
{
try
{
--
Gitblit v1.9.1