From 5849968d7f87ff596a98de0072b1111d4b10b1f5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 24 三月 2021 16:39:39 +0800
Subject: [PATCH] 新增生产资源设置
---
WebTM/WebTM.csproj.user | 2
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 21 +++-
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 180 ++++++++++++++++++++++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 41 +++-----
WebTM/views/index.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml | 17 +++
WebTM/WebTM.csproj | 2
7 files changed, 232 insertions(+), 33 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
new file mode 100644
index 0000000..a47e212
--- /dev/null
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>True</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFTM</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <SiteUrlToLaunchAfterPublish />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 6087195..0a2be27 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -11,10 +11,10 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/24/2021 14:06:39</publishTime>
+ <publishTime>03/24/2021 16:35:44</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/24/2021 14:06:39</publishTime>
+ <publishTime>03/24/2021 16:35:44</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -581,7 +581,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>03/23/2021 14:37:09</publishTime>
+ <publishTime>03/24/2021 16:11:22</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>03/24/2021 14:01:04</publishTime>
+ <publishTime>03/24/2021 16:33:50</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1093,8 +1093,8 @@
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">
<publishTime>03/23/2021 16:28:14</publishTime>
</File>
- <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcessBillList.html">
- <publishTime>03/23/2021 15:48:21</publishTime>
+ <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
+ <publishTime>03/24/2021 16:33:45</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1108,6 +1108,15 @@
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
<publishTime>03/24/2021 10:29:28</publishTime>
</File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
@@ -1115,24 +1124,6 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
@@ -1271,7 +1262,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/23/2021 15:50:53</publishTime>
+ <publishTime>03/24/2021 16:35:45</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 4d43ce3..1808579 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -11,10 +11,10 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/24/2021 16:11:44</publishTime>
+ <publishTime>03/24/2021 16:33:50</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/24/2021 16:11:44</publishTime>
+ <publishTime>03/24/2021 16:33:50</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>03/24/2021 16:10:32</publishTime>
+ <publishTime>03/24/2021 16:33:50</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1096,20 +1096,29 @@
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcessBillList.html">
<publishTime>03/23/2021 15:48:21</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
+ <publishTime>03/24/2021 16:33:45</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
+ <publishTime>03/24/2021 09:59:52</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
+ <publishTime>03/24/2021 10:29:28</publishTime>
+ </File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
- <publishTime>03/24/2021 14:04:02</publishTime>
+ <publishTime>03/24/2021 16:10:32</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
- <publishTime>03/24/2021 15:22:58</publishTime>
+ <publishTime>03/24/2021 16:10:32</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
- <publishTime>03/24/2021 14:50:32</publishTime>
+ <publishTime>03/24/2021 16:10:32</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 895547a..a574249 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -63,6 +63,7 @@
<Content Include="layuiadmin\layui\font\iconfont.eot" />
<Content Include="layuiadmin\layui\font\iconfont.ttf" />
<Content Include="layuiadmin\layui\font\iconfont.woff" />
+ <None Include="Properties\PublishProfiles\JFTM.pubxml" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -427,6 +428,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Source.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadReason.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessDetail.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 4d303d9..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>webtm</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b1a9db9..0746e60 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -203,7 +203,7 @@
<a>鐢熶骇鍩虹璧勬枡</a>
<dl class="layui-nav-child">
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭璁剧疆</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">鐢熶骇璧勬簮璁剧疆</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇璧勬簮璁剧疆</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜璁剧疆</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
new file mode 100644
index 0000000..e118a10
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -0,0 +1,180 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鐢熶骇璧勬簮璁剧疆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
+ , { field: 'Hprocid', title: 'Hprocid', hide: true }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Gy_Source/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/Gy_Source/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1