From cadd1baaae5ae32f5414b0277fabd52d76c8c1ea Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期五, 26 十二月 2025 08:40:07 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx | 29 +++++++++
WebTM/views/Baseset/HBarPlanPrint.html | 3 +
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 2
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html | 15 +++-
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 10 +-
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs | 26 ++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 9 +++
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.cs | 17 +++++
WebTM/WebTM.csproj | 8 ++
10 files changed, 110 insertions(+), 11 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 536cd79..e79fbbe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
@@ -2699,6 +2700,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.designer.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index b465e21..880ca0d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,13 +7,22 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+<<<<<<< HEAD
+=======
+ /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
+>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
// var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+<<<<<<< HEAD
// var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+=======
+
+ /*var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
/* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/Baseset/HBarPlanPrint.html b/WebTM/views/Baseset/HBarPlanPrint.html
index b829d70..33719f5 100644
--- a/WebTM/views/Baseset/HBarPlanPrint.html
+++ b/WebTM/views/Baseset/HBarPlanPrint.html
@@ -70,6 +70,9 @@
case "HDepartMent"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill_xiaowei"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
+ break;
//case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
// break;
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index cc9acdf..dd4b3aa 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -539,7 +539,7 @@
resolve({
HMaterID: data[0].HMaterID,
HMaterNumber: data[0].HMaterNumber,
- HMaterName: data[0].HMaterName,
+ HMaterName: data[0].HMaterName_m,
HMaterModel: data[0].HMaterModel
});
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 427126c..95640e0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -49,7 +49,8 @@
<!-- 杞Щ妯″紡閫夋嫨鎸夐挳 -->
<div class="transfer-mode-buttons">
- <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱缁戝畾</button>
+ <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱(鍏ュ簱)缁戝畾</button>
+ <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer2">灏忚溅-浠撳簱(鍑哄簱)缁戝畾</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">灏忚溅杞Щ</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">浠撳簱杞Щ</button>
</div>
@@ -184,7 +185,7 @@
<input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
</div>
</div>
- </div>
+ </div>cmdBind
</div>
<!--涓婃灦淇℃伅-->
<div class="layui-tab-item">
@@ -254,7 +255,7 @@
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
var HBillNo_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
-
+ var bindsignal = 0;
//#endregion
// 鍒濆鍖栬浆绉绘ā寮�
@@ -276,6 +277,12 @@
$('#btnCarWarehouseTransfer').on('click', function() {
setTransferMode('car_warehouse');
+ $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
+ setOrigin();
+ });
+ $('#btnCarWarehouseTransfer2').on('click', function () {
+ setTransferMode('car_warehouse');
+ bindsignal = 1;
$(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
setOrigin();
});
@@ -1125,7 +1132,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/BindCarAndWH",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
+ data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID, "bindsignal": bindsignal },
success: function (result) {
if (result.count == 1) {
playSound_OK();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
new file mode 100644
index 0000000..2270bca
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
@@ -0,0 +1,29 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipFileMainBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack 鏍堟澘鐮�,HBarCode 涓鐮�,b.hnumber 鐗╂枡浠ｇ爜,b.hname 鐗╂枡鍚嶇О from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
new file mode 100644
index 0000000..b792947
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_xiaoweizutuo : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
new file mode 100644
index 0000000..b8aa324
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipFileMainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 60e4ffb..7f3d5a6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -38,7 +38,7 @@
<option value="" selected="selected">鍏ㄩ儴</option>
<option value="1253">涓婃灦</option>
<option value="1252">涓嬫灦</option>
- <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
+ <option value="灏忚溅鍏ュ簱缁戝畾">灏忚溅缁戝畾</option>
<option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
<option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
<option value="10004">灏忚溅閿佸畾</option>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index ae56746..d660f01 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1392,11 +1392,11 @@
layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return; //return; 闃绘鍑芥暟缁х画鎵ц
}
- if ($("#HExRate").val() == 0) {
- //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
- layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HExRate").val() == 0) {
+ // //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+ // layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
$("#HPSStyleID").val(0)
--
Gitblit v1.9.1