src/main/java/com/zy/asrs/controller/LocDetlController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/LocDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/pakStore/stockOut.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/pakStore/locDetlCheckQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/pakStore/locDetlQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -57,6 +57,16 @@ } return R.ok("导入成功"); } @PostMapping("/getLocDateByLocNo") @ManagerAuth(memo = "根据包装组号提取一整箱库存") public R getLocDateByLocNo(@RequestBody List<String> packageNoList) { List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>().in("brand", packageNoList)); return R.ok(locDetls); } @Transactional(rollbackFor = Exception.class) public void importLocData1(MultipartFile multipartFile) throws IOException { EasyExcel.read(multipartFile.getInputStream(), LocMat.class, src/main/resources/mapper/LocDetlMapper.xml
@@ -160,6 +160,15 @@ <if test="specs!=null and specs!='' "> and a.specs like '%' + #{specs} + '%' </if> <if test="brand!=null and brand!='' "> and a.brand like '%' + #{brand} + '%' </if> <if test="model!=null and model!='' "> and a.model like '%' + #{model} + '%' </if> <if test="unit!=null and unit!='' "> and a.unit like '%' + #{unit} + '%' </if> </sql> <select id="getStockOutPage" resultMap="BaseResultMap"> src/main/webapp/static/js/pakStore/stockOut.js
@@ -9,7 +9,7 @@ ]; arrRemove(detlCols, 'field', 'anfme'); cols.push.apply(cols, detlCols); cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 80}) // cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 80}) return cols; } src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -73,19 +73,18 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="matnr" placeholder="规格" autocomplete="off"> <input class="layui-input" type="text" name="brand" placeholder="包装组号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="specs" placeholder="接头" autocomplete="off"> <input class="layui-input" type="text" name="model" placeholder="卷号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="maktx" placeholder="物料描述" autocomplete="off"> <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off"> </div> </div> <!-- 日期范围 --> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> @@ -186,27 +185,24 @@ layer.msg("请选择数据", {icon: 2}); return; } let locNos = []; data.forEach(function(elem) { locNos.push(elem.locNo); }); const reqDate = [...new Set(data.map(obj => obj.brand))] $.ajax({ url: baseUrl+"/locDetl/auth", url: baseUrl+"/getLocDateByLocNo", headers: {'token': localStorage.getItem('token')}, data: {locNos:locNos}, data: JSON.stringify(reqDate), contentType:'application/json;charset=UTF-8', dataType:'json', method: 'POST', async: false, success: function (res) { if (res.code === 200) { data = res.data; } else if (res.code === 403) { top.location.href = baseUrl + "/"; if (res.code === 200){ parent.addTableData(res.data); } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { layer.msg(res.msg) layer.msg(res.msg, {icon: 2}) } } }) parent.addTableData(data); }); break; } }); src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,17 +64,17 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="matnr" placeholder="规格" autocomplete="off"> <input class="layui-input" type="text" name="brand" placeholder="包装组号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="maktx" placeholder="物料名称" autocomplete="off"> <input class="layui-input" type="text" name="model" placeholder="卷号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off"> <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off"> </div> </div> <!-- 日期范围 --> @@ -190,7 +190,25 @@ layer.msg("请选择数据"); return; } parent.addTableData(dataList); const reqDate = [...new Set(dataList.map(obj => obj.brand))] $.ajax({ url: baseUrl+"/getLocDateByLocNo", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(reqDate), contentType:'application/json;charset=UTF-8', dataType:'json', method: 'POST', success: function (res) { if (res.code === 200){ parent.addTableData(res.data); } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { layer.msg(res.msg, {icon: 2}) } } }); break; } });