#

18516761980

2021-08-20 e33aed420fa57612694367aa222f7280b9720cca

#

 pom.xml

@@ -116,7 +116,7 @@
    </dependencies>

    <build>
        <finalName>whthwms</finalName>
        <finalName>xgmwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/controller/MatStoreController.java

New file
@@ -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()));
    }
}

 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";

 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 {

 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');

 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: '颜色'}
]


 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>
        <!-- 日期范围 -->

 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">