From e33aed420fa57612694367aa222f7280b9720cca Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 20 八月 2021 13:22:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/webservice/mock/DemoMock.java | 2 +-
src/main/java/waitMatin.sql | 2 +-
src/main/webapp/static/js/common.js | 4 ++--
pom.xml | 2 +-
src/main/java/com/zy/asrs/controller/MatStoreController.java | 30 ++++++++++++++++++++++++++++++
src/main/java/com/zy/common/CodeBuilder.java | 2 +-
src/main/webapp/views/pakStore/matQuery.html | 2 +-
src/main/webapp/views/waitMatin/waitMatin.html | 14 +++++++-------
8 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7d77989..b52ca42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
</dependencies>
<build>
- <finalName>whthwms</finalName>
+ <finalName>xgmwms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/MatStoreController.java b/src/main/java/com/zy/asrs/controller/MatStoreController.java
new file mode 100644
index 0000000..a20063c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/MatStoreController.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.controller;
+
+import com.core.annotations.ManagerAuth;
+import com.core.common.R;
+import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.service.WorkService;
+import com.zy.common.web.BaseController;
+import com.zy.ints.service.WaitMatinService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鍏ュ簱浣滀笟鎺у埗鍣�(鏍规嵁閫氱煡妗�)
+ * Created by TQS on 2021/8/20
+ */
+@RestController
+public class MatStoreController extends BaseController {
+ @Autowired
+ private WaitMatinService waitMatinService;
+ @Autowired
+ private WorkService workService;
+
+ @RequestMapping("/mat/store/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱(閫氱煡妗�)")
+ public R matStoreStart(@RequestBody FullStoreParam fullStoreParam) {
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ }
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 9ee5a15..894e2d5 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,7 +15,7 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="127.0.0.1:1433;databasename=whthasrs";
+ generator.url="127.0.0.1:1433;databasename=xgmasrs";
generator.username="sa";
generator.password="sa@123";
generator.table="ints_wait_matin";
diff --git a/src/main/java/com/zy/common/webservice/mock/DemoMock.java b/src/main/java/com/zy/common/webservice/mock/DemoMock.java
index de7ea4b..d81fc16 100644
--- a/src/main/java/com/zy/common/webservice/mock/DemoMock.java
+++ b/src/main/java/com/zy/common/webservice/mock/DemoMock.java
@@ -11,7 +11,7 @@
public static void main(String[] args) {
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
- Client client = dcf.createClient("http://localhost:8081/whthwms/webservice/webservice?wsdl");
+ Client client = dcf.createClient("http://localhost:8081/xgmwms/webservice/webservice?wsdl");
Object[] objects = new Object[0];
ObjectMapper mapper = new ObjectMapper();
try {
diff --git a/src/main/java/waitMatin.sql b/src/main/java/waitMatin.sql
index 507bda2..7912df8 100644
--- a/src/main/java/waitMatin.sql
+++ b/src/main/java/waitMatin.sql
@@ -10,7 +10,7 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatin#btn-into', '瀵煎叆', '', '3', '5', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatin/waitMatin.html', N'鍏ュ簱閫氱煡妗�', 鈥�222鈥�, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatin/waitMatin.html', N'鍏ュ簱閫氱煡妗�', '222', '2', null, '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatin#view', N'鏌ヨ', '20393', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatin#btn-add', N'鏂板', '20393', '3', '1', '1');
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 23a5a8d..987bb1c 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/whthwms";
+var baseUrl = "/xgmwms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
@@ -172,7 +172,7 @@
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
// ,{field: 'num1', align: 'center',title: '鏁伴噺'}
- ,{field: 'size', align: 'center',title: '灏哄'}
+ ,{field: 'size', align: 'center',title: '灏哄', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊'}
]
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 7086f9d..e923846 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -27,7 +27,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 92e81c2..309af3f 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -90,7 +90,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐗╂枡鍚嶇О: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" lay-vertype="tips" lay-verify="required" disabled="disabled">
+ <input class="layui-input" name="matName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -102,37 +102,37 @@
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸: </label>
<div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�" disabled="disabled">
+ <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">鍗曚綅: </label>
<div class="layui-input-block">
- <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�" disabled="disabled">
+ <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">灏哄: </label>
<div class="layui-input-block">
- <input class="layui-input" name="size" placeholder="璇疯緭鍏ュ昂瀵�" disabled="disabled">
+ <input class="layui-input" name="size" placeholder="璇疯緭鍏ュ昂瀵�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">棰滆壊: </label>
<div class="layui-input-block">
- <input class="layui-input" name="color" placeholder="璇疯緭鍏ラ鑹�" disabled="disabled">
+ <input class="layui-input" name="color" placeholder="璇疯緭鍏ラ鑹�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">鍗曢噸: </label>
<div class="layui-input-block">
- <input class="layui-input" name="weight" placeholder="璇疯緭鍏ュ崟閲�" disabled="disabled">
+ <input class="layui-input" name="weight" placeholder="璇疯緭鍏ュ崟閲�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�" disabled="disabled">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
</div>
</div>
<div class="layui-form-item" style="display: none">
--
Gitblit v1.9.1