#

mrzhssss

2022-03-22 75b8acaa4617ec20d6da616b8ccf02b1f71fdc69

#

 src/main/java/zy/cloud/wms/common/model/MatnrDto.java

@@ -14,4 +14,5 @@

    private  String batch;


}

 src/main/java/zy/cloud/wms/common/model/PickOutDto.java

New file
@@ -0,0 +1,20 @@
package zy.cloud.wms.common.model;

import lombok.Data;

@Data
public class PickOutDto {
    private Integer anfme;
    private String locNo;
    private String maktx;
    private String matnr;
    private Integer nodeId;
    private Boolean prior;
    private Integer reduce;
    private Integer remQty;
    private String title;
    private Integer total;
    private Integer type;
    private String waveId;

}

 src/main/java/zy/cloud/wms/common/service/MainService.java

@@ -538,6 +538,7 @@
                tab.setPrior(false);
                tab.setPrior$("×");
                tab.setType(0);
                tab.setWaveId(waveStoDto.getOrderNo());
                res.add(tab);
            }

@@ -562,6 +563,7 @@
                    tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
                    tab.setPrior$(tab.getPrior()?"✔":"×");
                    tab.setType(1);
                    tab.setWaveId(waveStoDto.getOrderNo());
                    res.add(tab);
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();

 src/main/java/zy/cloud/wms/manager/controller/PickoutController.java

@@ -82,9 +82,12 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
             Pickout picout = pickoutService.selectOne(new EntityWrapper<Pickout>()
                     .eq("id", id));
             pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
                    .eq("head_id",id));
            pickoutService.deleteById(id);
            pickoutService.updateWaveStatus(picout.getWaveNo());
        }
        return R.ok();
    }

 src/main/java/zy/cloud/wms/manager/controller/WaveController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -162,9 +163,8 @@

    @RequestMapping("/wave/createOut")
    @ManagerAuth
    public R createWaveOut(@RequestBody Wave wave){

        return waveService.createOut(wave,getUserId(),getHostId());
    public R createWaveOut(@RequestBody List<PickOutDto> pickOutDtosk){
        return waveService.createOut(pickOutDtosk,getUserId(),getHostId());
    }

    @RequestMapping("/wave/preview")

 src/main/java/zy/cloud/wms/manager/entity/Pickout.java

@@ -97,6 +97,10 @@

    @TableField("order_nos")
    private String orderNos;

    @TableField("wave_no")
    private String waveNo;

    public Pickout() {}


@@ -115,13 +119,16 @@

    public String getWrkSts$(){
        if (this.wrkSts == 1) {
            return "未拣货";
        }
        if (this.wrkSts == 2) {
            return "未打印";
        }
        if (this.wrkSts == 2) {
            return "未拣货";
        }
        if (this.wrkSts == 3) {
            return "已完成";
            return "开始拣货";
        }
        if (this.wrkSts == 4) {
            return "拣货完成";
        }
        return "";
    }

 src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java

@@ -32,4 +32,6 @@

    private Integer type;

    private String waveId;

}

 src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java

@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.mapper;

import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.Pickout;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,4 +10,5 @@
@Repository
public interface PickoutMapper extends BaseMapper<Pickout> {

    void updateWaveStatus(@Param("waveNo") String waveNo);
}

 src/main/java/zy/cloud/wms/manager/service/PickoutService.java

@@ -5,4 +5,5 @@

public interface PickoutService extends IService<Pickout> {

    void updateWaveStatus(String waveNo);
}

 src/main/java/zy/cloud/wms/manager/service/WaveService.java

@@ -1,10 +1,13 @@
package zy.cloud.wms.manager.service;

import com.core.common.R;
import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import com.baomidou.mybatisplus.service.IService;

import java.util.List;

public interface WaveService extends IService<Wave> {

    R createOut(Wave wave, Long userId, Long hostId);
    R createOut(List<PickOutDto> pickOutDtosk, Long userId, Long hostId);
}

 src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java

@@ -9,4 +9,8 @@
@Service("pickoutService")
public class PickoutServiceImpl extends ServiceImpl<PickoutMapper, Pickout> implements PickoutService {

    @Override
    public void updateWaveStatus(String waveNo) {
        this.baseMapper.updateWaveStatus(waveNo);
    }
}

 src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java

@@ -5,16 +5,16 @@
import com.core.common.R;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.WaveMapper;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
import zy.cloud.wms.manager.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;

@@ -26,23 +26,72 @@
    private OrderService orderService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private PickoutService pickoutService;
    @Autowired
    private PickoutDetlService pickoutDetlService;
    @Autowired
    private MatService matService;

    /**
     * 通过波次生成拣货单
     * @param wave
     * @param
     * @param userId
     * @param hostId
     */
    @Override
    public R createOut(Wave wave, Long userId, Long hostId) {
    public R createOut(List<PickOutDto> pickOutDtosk, Long userId, Long hostId) {
        HashSet<String> orderIds = new HashSet<>();
        /**
         * 控管
         */
        if (Cools.isEmpty(pickOutDtosk)) {
            throw new CoolException("数据传输错误,请联系管理员");
        }
        Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
                .eq("id", pickOutDtosk.get(0).getWaveId()));
        List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
                .eq("wave_id", wave.getId()));
        if (Cools.isEmpty(waveDetls)) {
            throw new CoolException("找不到该波次单的详情,请联系管理员");

        /**
         * 生成拣货单
         */
        Pickout pickout = new Pickout();
        pickout.setHostId(hostId);
        pickout.setUserId(userId);
        pickout.setWrkNo("PO-"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
        pickout.setWrkSts(1L);
        pickout.setCreateBy(userId.intValue());
        pickout.setUpdateBy(userId.intValue());
        pickout.setOrderQty(wave.getOrdersQty());
        pickout.setWaveNo(wave.getWaveNo());
        pickoutService.insert(pickout);
        for (PickOutDto pickOutDto : pickOutDtosk) {
            Mat mat = matService.selectByMatnr(hostId, pickOutDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                pickoutService.delete(new EntityWrapper<Pickout>()
                        .eq("id",pickout.getId()));
                throw new CoolException("查询不到该物料明细");

            }
            PickoutDetl pickoutDetl = new PickoutDetl();
            pickoutDetl.setHeadId(pickout.getId());
            pickoutDetl.setNodeId(pickOutDto.getNodeId().longValue());
            pickoutDetl.setNodeName(pickOutDto.getLocNo());
            pickoutDetl.setAnfme(pickOutDto.getAnfme().doubleValue());
            pickoutDetl.setMatnr(pickOutDto.getMatnr());
            pickoutDetl.setMaktx(mat.getMaktx());
            pickoutDetl.setName(mat.getName());
            pickoutDetl.setSpecs(mat.getSpecs());
            pickoutDetl.setModel(mat.getModel());
            pickoutDetl.setUnit(mat.getUnit());
            pickoutDetl.setPrice(mat.getPrice());
            pickoutDetl.setWeight(mat.getWeight());
            pickoutDetl.setStatus(1);
            pickoutDetl.setCreateBy(userId.intValue());
            pickoutDetl.setUpdateBy(userId.intValue());
            pickoutDetl.setWrkNo(pickout.getWrkNo());
            pickoutDetlService.insert(pickoutDetl);
        }

        /**
@@ -64,10 +113,6 @@
        wave.setStatus((short) 1);
        waveService.update(wave,new EntityWrapper<Wave>()
                .eq("id",wave.getId()));

        /**
         * 生成拣货单
         */


        return R.ok();

 src/main/resources/mapper/PickoutMapper.xml

@@ -15,7 +15,13 @@
        <result column="update_time" property="updateTime" />
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="order_qty" property="orderQty" />
        <result column="order_nos" property="orderNos" />
        <result column="wave_no" property="waveNo" />

    </resultMap>
    <update id="updateWaveStatus">
        update man_wave set status = 0 where wave_no = #{waveNo}
    </update>

</mapper>

 src/main/webapp/static/js/order/order.js

@@ -53,6 +53,7 @@
        }
    });


    /* 表格搜索 */
    form.on('submit(docTypeTableSearch)', function (data) {
        insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});

 src/main/webapp/static/js/pickout/pickout.js

@@ -34,7 +34,7 @@
        defaultToolbar: [],
        cols:[[
            // {type: 'checkbox'}
            {field: 'wrkNo', align: 'center',title: '任务号'}
            {field: 'wrkNo', align: 'center',title: '任务号',width: 180}
            ,{field: 'id', align: 'center',title: '唯一ID',hide: true}
            ,{field: 'hostId', align: 'center',title: '商户ID', hide: true}
            ,{field: 'userId', align: 'center',title: '用户ID', hide: true}
@@ -47,7 +47,7 @@
            ,{field: 'updateBy', align: 'center',title: '', hide:true}
            ,{field: 'memo', align: 'center',title: '', hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:180}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}
        ]],
        done: function (res,curr,count){
            $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
@@ -66,10 +66,17 @@
                break;
        }
    });
    /* 监听行单击事件 */
    var selObj;
    table.on('row(leftTable)', function (obj) {
        selObj = obj;
        obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
        insTb2.reload({where: {doc_type: obj.data.docId}, page: {curr: 1}});
    });

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
        layer.confirm('确定要撤销选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
@@ -100,7 +107,7 @@
    tableIns = table.render({
        elem: '#pickout',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/pickout/list/auth',
        url: baseUrl+'/pickoutDetl/list/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
@@ -108,20 +115,34 @@
        cellMinWidth: 50,
        cols: [[
            // {type: 'checkbox'}
            {field: 'wrkNo', align: 'center',title: '任务号'}
            ,{field: 'id', align: 'center',title: '唯一ID'}
            ,{field: 'hostId', align: 'center',title: '商户ID'}
            ,{field: 'userId', align: 'center',title: '用户ID'}
            {field: 'id', align: 'center',title: '唯一ID', hide:true}
            ,{field: 'headId', align: 'center',title: '表头ID', hide:true}
            ,{field: 'nodeId', align: 'center',title: '库位ID', hide:true}
            ,{field: 'nodeName', align: 'center',title: '库位名称'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'name', align: 'center',title: '名称', hide:true}
            ,{field: 'specs', align: 'center',title: '规格', hide:true}
            ,{field: 'model', align: 'center',title: '型号', hide:true}
            ,{field: 'batch', align: 'center',title: '批号', hide:true}
            ,{field: 'unit', align: 'center',title: '单位', hide:true}
            ,{field: 'barcode', align: 'center',title: '托盘码', hide:true}
            ,{field: 'docType', align: 'center',title: '单据类型', hide:true}
            ,{field: 'docId', align: 'center',title: '单据编号', hide:true}
            ,{field: 'price', align: 'center',title: '价格', hide:true}
            ,{field: 'weight', align: 'center',title: '重量', hide:true}
            ,{field: 'status', align: 'center',title: '状态' , hide:true}
            ,{field: 'pickStaff', align: 'center',title: '拣货员ID'}
            ,{field: 'pickStart$', align: 'center',title: '拣货开始时间'}
            ,{field: 'pickEnd$', align: 'center',title: '拣货结束时间'}
            ,{field: 'createTime$', align: 'center',title: '创建时间', hide:true}
            ,{field: 'createBy', align: 'center',title: '创建人员ID', hide:true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间', hide:true}
            ,{field: 'updateBy$', align: 'center',title: '修改人员ID', hide:true}
            ,{field: 'memo', align: 'center',title: '备注', hide:true}

            ,{field: 'wrkSts$', align: 'center',title: '工作状态' ,templet: '#wrkStsTpl' , width: 100}
            ,{field: 'zpallet', align: 'center',title: '条形码' , hide:true}
            ,{field: 'createTime$', align: 'center',title: '', hide:true}
            ,{field: 'createBy', align: 'center',title: '', hide:true}
            ,{field: 'updateTime$', align: 'center',title: '', hide:true}
            ,{field: 'updateBy', align: 'center',title: '', hide:true}
            ,{field: 'memo', align: 'center',title: '', hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:180}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
@@ -147,109 +168,109 @@
        }
    });

    // 监听排序事件
    table.on('sort(pickout)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(pickout)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.id;
               });
               del(ids);
               break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'pickout': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/pickout/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });
    /* 表格搜索 */
    form.on('submit(leftResearch)', function (data) {
        insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
        return false;
    });


    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#createTime\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#updateTime\\$',
        type: 'datetime'
    });

    }
    // // 监听排序事件
    // table.on('sort(pickout)', function (obj) {
    //     var searchData = {};
    //     $.each($('#search-box [name]').serializeArray(), function() {
    //         searchData[this.name] = this.value;
    //     });
    //     searchData['orderByField'] = obj.field;
    //     searchData['orderByType'] = obj.type;
    //     tableIns.reload({
    //         where: searchData,
    //         page: {curr: 1}
    //     });
    // });
    //
    // // 监听头工具栏事件
    // table.on('toolbar(pickout)', function (obj) {
    //     var checkStatus = table.checkStatus(obj.config.id).data;
    //     switch(obj.event) {
    //         case 'addData':
    //             showEditModel();
    //             break;
    //         case 'deleteData':
    //            if (checkStatus.length === 0) {
    //                layer.msg('请选择要删除的数据', {icon: 2});
    //                return;
    //            }
    //            var ids = checkStatus.map(function (d) {
    //                return d.id;
    //            });
    //            del(ids);
    //            break;
    //         case 'exportData':
    //             layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
    //                 var titles=[];
    //                 var fields=[];
    //                 obj.config.cols[0].map(function (col) {
    //                     if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
    //                         titles.push(col.title);
    //                         fields.push(col.field);
    //                     }
    //                 });
    //                 var exportData = {};
    //                 $.each($('#search-box [name]').serializeArray(), function() {
    //                     exportData[this.name] = this.value;
    //                 });
    //                 var param = {
    //                     'pickout': exportData,
    //                     'fields': fields
    //                 };
    //                 $.ajax({
    //                     url: baseUrl+"/pickout/export/auth",
    //                     headers: {'token': localStorage.getItem('token')},
    //                     data: JSON.stringify(param),
    //                     dataType:'json',
    //                     contentType:'application/json;charset=UTF-8',
    //                     method: 'POST',
    //                     success: function (res) {
    //                         layer.closeAll();
    //                         if (res.code === 200) {
    //                             table.exportFile(titles,res.data,'xls');
    //                         } else if (res.code === 403) {
    //                             top.location.href = baseUrl+"/";
    //                         } else {
    //                             layer.msg(res.msg, {icon: 2})
    //                         }
    //                     }
    //                 });
    //             });
    //             break;
    //     }
    // });
    // /* 表格搜索 */
    // form.on('submit(leftResearch)', function (data) {
    //     insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
    //     return false;
    // });
    //
    //
    // // 搜索
    // form.on('submit(search)', function (data) {
    //     pageCurr = 1;
    //     tableReload(false);
    // });
    //
    // // 重置
    // form.on('submit(reset)', function (data) {
    //     pageCurr = 1;
    //     clearFormVal($('#search-box'));
    //     tableReload(false);
    // });
    //
    // // 时间选择器
    // function layDateRender() {
    //         layDate.render({
    //     elem: '#createTime\\$',
    //     type: 'datetime'
    // });
    //     layDate.render({
    //     elem: '#updateTime\\$',
    //     type: 'datetime'
    // });
    //
    // }
    layDateRender();

});

 src/main/webapp/static/js/wave/wave.js

@@ -181,7 +181,7 @@
                        }
                        ,yes: function(index, layero){
                            //按钮【马上拣货】的回调
                            stockOut(res.data);
                            stockOut(res.data,data);
                        }
                        ,btn2: function(index, layero){
                            //按钮【稍后处理】的回调
@@ -198,10 +198,10 @@


    }
    function stockOut(mData){
    function stockOut(mData, data){

        console.log(mData);
        layer.confirm('确定生成该波次的拣货单？', {
        layer.confirm('确定生成该波次的拣货单？(不可逆)', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {

 src/main/webapp/views/pickout/pickout.html

@@ -17,19 +17,19 @@
        }

        /* 左表 */
        #docTypeTable + .layui-table-view .layui-table-tool-temp {
        #leftTable + .layui-table-view .layui-table-tool-temp {
            padding-right: 0;
        }

        #docTypeTable + .layui-table-view .layui-table-body tbody > tr td {
        #leftTable + .layui-table-view .layui-table-body tbody > tr td {
            cursor: pointer;
        }

        #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
        #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
            background-color: #fff3e0;
        }

        #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
        #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
            position: absolute;
            right: 6px;
            content: "\e602";
@@ -137,8 +137,12 @@

<script type="text/html" id="operate">
    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">打印拣货单</a>
    {{# } }}
    {{#if (d.wrkSts == 3){ }}
    <a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">完成</a>
    {{# } }}

<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">撤销</a>