From d291af0ea6fbda27a326d19a6a51d99c1cedff59 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 八月 2024 15:49:05 +0800
Subject: [PATCH] 直接调拨核对模块，扫源单方法增加私有云模式时通过WEBAPI重新同步单据功能；领料出库核对模块，扫物料条码调用方法修改，增加系统参数判断，安瑞先解析条码；新增设备维修记录报表调用方法
---
WebAPI/Controllers/SCGL/日计划管理/JIT_ICMOSortBillController.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
index 7e0c476..3fcd8eb 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
@@ -17,6 +17,8 @@
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
#region 鐢熶骇鏃ヨ鍒� 鏌ヨ
[Route("JIT_ICMOSortBill/JIT_ICMOSortBillList")]
[HttpGet]
@@ -34,7 +36,18 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList", "h_v_Sc_ICMOSortBillList");
+
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret)) {
+ //鍒ゆ柇瀹㈡埛涓哄嚡璐�
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟
+ {
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere, "h_v_Sc_ICMOSortBillList");
+ }
+ else {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere , "h_v_Sc_ICMOSortBillList");
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1