pom.xml
@@ -125,7 +125,7 @@ </dependencies> <build> <finalName>xgmwms</finalName> <finalName>jzwms</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> src/main/java/com/zy/Boot.java
@@ -7,7 +7,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.scheduling.annotation.EnableScheduling; // adsads // adsad @EnableScheduling @SpringBootApplication public class Boot extends SpringBootServletInitializer { src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -92,6 +92,7 @@ matCode.setModiTime(new Date()); matCode.setAppeUser(getUserId()); matCode.setAppeTime(new Date()); matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", "")); matCodeService.insert(matCode); return R.ok(); } src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -39,6 +39,7 @@ @RequestParam Map<String, Object> param){ excludeTrash(param); EntityWrapper<StaDesc> wrapper = new EntityWrapper<>(); wrapper.orderBy("type_no",true); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper)); 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/xgmwms/webservice/webservice?wsdl"); Client client = dcf.createClient(""); Object[] objects = new Object[0]; ObjectMapper mapper = new ObjectMapper(); try { src/main/resources/application.yml
@@ -19,7 +19,7 @@ #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs #username: sa #password: eisoft url: jdbc:sqlserver://192.168.4.208:1433;databasename=xgmasrs url: jdbc:sqlserver://192.168.4.208:1433;databasename=sxjzasrs username: sa password: sa@123 mvc: @@ -55,10 +55,10 @@ # 双深 doubleDeep: true # 双深库位排号 doubleLocs: 1,4,5,8,9,12 doubleLocs: 1 # 一个堆垛机负责的货架排数 groupCount: 4 groupCount: 3 #ERP接口 erp: enabled: true enabled: false src/main/webapp/static/js/basCrnError/basCrnError.js
@@ -98,7 +98,7 @@ content: 'basCrnError_detail.html', success: function(layero, index){ layer.getChildFrame('#data-detail-submit-edit', index).hide(); layer.getChildFrame('#errorCode', index).parent().parent().hide(); layer.getChildFrame('#errorCode', index).parent().parent().hide(); clearFormVal(layer.getChildFrame('#detail', index)); layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); } src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@ var baseUrl = "/xgmwms"; var baseUrl = "/jzwms"; // 详情窗口-高度 var detailHeight = '80%'; src/main/webapp/static/js/cool.js
@@ -172,7 +172,7 @@ } else if (res.code === 407) { banMsg = res.data + "不可用"; tips = layer.tips( "<span style='color:red;'>已存在</span>", "<span style='color:#ff0000;'>已存在</span>", '#'+id, { // tipsMore: true, src/main/webapp/views/basCrnError/basCrnError_detail.html
@@ -26,7 +26,7 @@ <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>异常代号：</label> <div class="layui-input-inline"> <input id="errorCode" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnError')" lay-verify="required|number"> <input id="errorCode" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnError')"> </div> </div> <div class="layui-inline" style="width:80%;"> src/main/webapp/views/locMast/locMast_detail.html
@@ -39,7 +39,7 @@ <label class="layui-form-label">库位类型：</label> <div class="layui-input-inline cool-auto-complete"> <input id="whsType" class="layui-input" type="text" style="display: none"> <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()> <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur() lay-verify="number"> <div class="cool-auto-complete-window"> <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> @@ -80,25 +80,25 @@ <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">堆垛机号：</label> <div class="layui-input-inline"> <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled"> <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">排：</label> <div class="layui-input-inline"> <input id="row1" class="layui-input" type="text" autocomplete="off" disabled="disabled"> <input id="row1" class="layui-input" type="text" autocomplete="off" disabled="disabled" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">列：</label> <div class="layui-input-inline"> <input id="bay1" class="layui-input" type="text" autocomplete="off" disabled="disabled"> <input id="bay1" class="layui-input" type="text" autocomplete="off" disabled="disabled" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">层：</label> <div class="layui-input-inline"> <input id="lev1" class="layui-input" type="text" autocomplete="off" disabled="disabled"> <input id="lev1" class="layui-input" type="text" autocomplete="off" disabled="disabled" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:80%;display: none"> src/main/webapp/views/matCode/matCode_detail.html
@@ -24,9 +24,9 @@ </div> --> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>产品编码：</label> <label class="layui-form-label">产品编码：</label> <div class="layui-input-inline"> <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" > <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" > </div> </div> <div class="layui-inline" style="width:31%;display: none"> @@ -36,9 +36,9 @@ </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">产品名称：</label> <label class="layui-form-label"><span class="not-null">*</span>产品名称：</label> <div class="layui-input-inline"> <input id="matName" class="layui-input" type="text"> <input id="matName" class="layui-input" type="text" lay-verify="required"> </div> </div> <div class="layui-inline" style="width:31%;"> src/main/webapp/views/pda/index.html
@@ -73,7 +73,7 @@ <!-- 导航栏 --> <ul class="nav"> <li><a id="combPro" onclick="nav(this.id)" class="nav-select" href="#">入库单组托</a></li> <!-- 根据入库单组托 --> <!-- <li><a id="combPro" onclick="nav(this.id)" class="nav-select" href="#">入库单组托</a></li> <!– 根据入库单组托 –>--> <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">组托</a></li> <!-- 根据物料产品组托 --> <!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">入库</a></li>--> <!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">出库</a></li>--> src/main/webapp/views/rowLastno/rowLastno_detail.html
@@ -26,7 +26,7 @@ <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>类 别：</label> <div class="layui-input-inline"> <input id="whsType" class="layui-input" type="text" onkeyup="check(this.id, 'rowLastno')" lay-verify="required"> <input id="whsType" class="layui-input" type="text" onkeyup="check(this.id, 'rowLastno')" lay-verify="required|number"> </div> </div> <div class="layui-inline" style="width:31%;"> @@ -38,25 +38,25 @@ <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">当前排号：</label> <div class="layui-input-inline"> <input id="currentRow" class="layui-input" type="text"> <input id="currentRow" class="layui-input" type="text" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">起始排号：</label> <div class="layui-input-inline"> <input id="sRow" class="layui-input" type="text"> <input id="sRow" class="layui-input" type="text" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">终止排号：</label> <div class="layui-input-inline"> <input id="eRow" class="layui-input" type="text"> <input id="eRow" class="layui-input" type="text" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">堆垛机数量：</label> <div class="layui-input-inline"> <input id="crnQty" class="layui-input" type="text"> <input id="crnQty" class="layui-input" type="text" lay-verify="number"> </div> </div> <div class="layui-inline" style="width:31%;"> src/main/webapp/views/wrkLastno/wrkLastno_detail.html
@@ -26,25 +26,25 @@ <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>类 型：</label> <div class="layui-input-inline"> <input id="wrkMk" class="layui-input" type="text" onkeyup="check(this.id, 'wrkLastno')"> <input id="wrkMk" class="layui-input" type="text" onkeyup="check(this.id, 'wrkLastno')" lay-verify="required|number"> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>当前ID：</label> <div class="layui-input-inline"> <input id="wrkNo" class="layui-input" type="text" lay-verify="required" > <input id="wrkNo" class="layui-input" type="text" lay-verify="required|number"> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>终止ID：</label> <div class="layui-input-inline"> <input id="eno" class="layui-input" type="text" lay-verify="required" > <input id="eno" class="layui-input" type="text" lay-verify="required|number" > </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label"><span class="not-null">*</span>起始ID：</label> <div class="layui-input-inline"> <input id="sno" class="layui-input" type="text" lay-verify="required" > <input id="sno" class="layui-input" type="text" lay-verify="required|number"> </div> </div> <div class="layui-inline" style="width:31%;">
