#

18516761980

2021-09-09 5747655ff976c6226cf6e0ebcaef6d38d396bb9f

#

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

@@ -1,28 +1,42 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.PltBarcode;
import com.zy.asrs.service.PltBarcodeService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.PltBarcode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.PltBarcodeService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.common.web.BaseController;
import com.zy.ints.entity.WaitMatin;
import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class PltBarcodeController extends BaseController {

    @Autowired
    private PltBarcodeService pltBarcodeService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WaitMatinService waitMatinService;

    @RequestMapping(value = "/pltBarcode/{id}/auth")
    @ManagerAuth
@@ -36,10 +50,12 @@
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PltBarcode.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(pltBarcodeService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -76,9 +92,27 @@

    @RequestMapping(value = "/pltBarcode/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            pltBarcodeService.deleteById(id);
    public R delete(@RequestParam(value="ids[]") String[] ids){
         for (String id : ids){
             int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",id));
             int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",id));
             if (countLoc > 0 || countWrk > 0) {
                 return R.error("工作档或库存条码数据已存在");
             }else {
//                 List<WaitMatin> waitMatins = waitMatinService.selectList();
                 List<PltBarcode> pltBarcodes = pltBarcodeService.selectList(new EntityWrapper<PltBarcode>().eq("barcode", id));
                 for(PltBarcode pltBarcode : pltBarcodes){
                     WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",pltBarcode.getBillNo())
                                    .eq("seq_no",pltBarcode.getSeqNo()).eq("mat_no",pltBarcode.getMatNo()));
                     if(null != waitMatin){
                         waitMatin.setInQty(waitMatin.getInQty()-pltBarcode.getQty());
                         waitMatinService.update(waitMatin,new EntityWrapper<WaitMatin>().eq("bill_no",pltBarcode.getBillNo())
                                 .eq("seq_no",pltBarcode.getSeqNo()).eq("mat_no",pltBarcode.getMatNo()));
                     }
                 }
                 pltBarcodeService.delete(new EntityWrapper<PltBarcode>().eq("barcode", id));
             }
//            pltBarcodeService.deleteById(id);
        }
        return R.ok();
    }

 src/main/webapp/static/js/pltBarcode/pltBarcode.js

@@ -43,7 +43,7 @@
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            // ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
@@ -96,7 +96,7 @@
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.seqNo;
                   return d.barcode;
               });
               del(ids);
               break;
@@ -149,7 +149,7 @@
                showEditModel(data);
                break;
            case "del":
                var ids = [data.seqNo];
                var ids = [data.barcode];
                del(ids);
                break;
        }
@@ -195,7 +195,7 @@

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
        layer.confirm('确定要删除选中数据吗？将删除该条码组托所有数据', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {

 src/main/webapp/views/pltBarcode/pltBarcode.html

@@ -17,7 +17,12 @@
<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="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="barcode" placeholder="条码号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
@@ -33,15 +38,15 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>-->
<!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>