From bce487d7ba324c0f623f0c605f4686f382dbdcec Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 12:04:47 +0800
Subject: [PATCH] 上架归还增加重复扫码校验
---
WebTM/WebTM.csproj | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 19fa5cd..4e7eb63 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -19,6 +19,8 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
+ <Use64BitIISExpress />
+ <UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -254,6 +256,7 @@
<None Include="layuiadmin\Scripts\jquery-1.4.1-vsdoc.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.min.js" />
+ <Content Include="layuiadmin\Scripts\jquery-3.5.1.min.js" />
<Content Include="layuiadmin\Scripts\json2.js" />
<Content Include="layuiadmin\Scripts\webConfig.js" />
<Content Include="layuiadmin\style\admin.css" />
@@ -274,6 +277,7 @@
<Content Include="layuiadmin\tpl\system\theme.html" />
<Content Include="layuiadmin\tpl\system\璇存槑.txt" />
<Content Include="layuiadmin\tpl\璇存槑.txt" />
+ <Content Include="layuiadmin\zgqCustom\zgqCustom.js" />
<Content Include="views\app\content\comment.html" />
<Content Include="views\app\content\contform.html" />
<Content Include="views\app\content\list.html" />
@@ -296,6 +300,8 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EmployeeList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionResourcesList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WorkCenterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionTeamList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierList.html" />
@@ -408,12 +414,28 @@
<Content Include="views\user\user\userform.html" />
<Content Include="views\user\璇存槑.txt" />
<Content Include="views\涓嶈壇姹囨姤\Xs_SeOrderPickUp.html" />
- <Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
- <Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForReturnBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_UpMoveStockBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessDetail.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessList.html" />
+ <Content Include="views\宸ュ簭姹囨姤\MES_StationInBill_PDA.html" />
<Content Include="views\宸ュ簭姹囨姤\MES_StationInBill.html" />
+ <Content Include="views\宸ュ簭姹囨姤\MES_StationInBillList.html" />
+ <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill_PDA.html" />
<Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill.html" />
+ <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillList.html" />
<Content Include="views\缁勮鍗昞Sc_AssemblyBill_Fast.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductionProcessDetailsReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_Fast.html" />
@@ -456,8 +478,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Folder Include="views\浠撳簱璋冩嫧\璋冩嫧鍗曟牳瀵筡" />
- <Folder Include="views\浠撳簱璋冩嫧\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
+ <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1