#

luxiaotao1123

2021-03-02 2b8da361b039e8b85b095b3261310be2a37618b8

#

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

@@ -68,6 +68,8 @@
                    pakout.setNodeId(locDetl.getNodeId());
                    pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                    VersionUtils.setPakout(pakout, mat);
//                    pakout.setDocId(custOrder.getBTypeId());
                    pakout.setDocNum(custOrder.getNumber());    // 单据编号
                    pakout.setCreateTime(now);
                    pakout.setUpdateTime(now);
                    pakout.setStatus(1);
@@ -78,7 +80,7 @@
                    if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) {
                        throw new CoolException("修改库存明细数量失败");
                    }
                    // 剩余待出货位递减
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                }
            }

 src/main/java/zy/cloud/wms/common/utils/VersionUtils.java

@@ -55,8 +55,6 @@
        pakout.setBatch(mat.getBatch());
        pakout.setUnit(mat.getUnit());
        pakout.setBarcode(mat.getBarcode());
        pakout.setDocId(mat.getDocId());
        pakout.setDocNum(mat.getDocNum());
        pakout.setCustName(mat.getCustName());
        pakout.setItemNum(mat.getItemNum());
        pakout.setCount(mat.getCount());

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

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

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,9 +9,13 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;

import java.util.List;

/**
 * Created by vincent on 2021/2/25
@@ -21,6 +26,8 @@

    @Autowired
    private WorkService workService;
    @Autowired
    private PakoutService pakoutService;

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
@@ -40,4 +47,17 @@
        return workService.stockOut(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/allot")
    @ManagerAuth(memo = "库存调拨")
    public R stockAllot() {
        return R.ok();
    }

    @RequestMapping("/pakout/get")
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
        return R.ok().add(pakouts);
    }

}

 src/main/webapp/static/js/custOrder/custOrder.js

@@ -181,7 +181,7 @@
        switch (obj.event) {
            // 拣货
            case 'stockOut':
                layer.confirm(data.number + ' 订单拣货', {shadeClose: true}, function(){
                layer.confirm(data.number + ' 订单捡货', {shadeClose: true}, function(){
                    layer.closeAll();
                    $.ajax({
                        url: baseUrl+"/work/stock/out",
@@ -250,6 +250,28 @@
        }
    });

    // 打印捡货单
    function printPakouts(docNumber) {
        $.ajax({
            url: baseUrl+"/work/pakout/get",
            headers: {'token': localStorage.getItem('token')},
            data: {
                docNumber: docNumber
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    alert(JSON.stringify(res.data));
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                }
                layer.close(index);
            }
        })
    }

    // 数据保存动作
    form.on('submit(save)', function () {
        if (banMsg != null){

 src/main/webapp/views/custOrder/custOrder.html

@@ -40,7 +40,7 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-xs" lay-event="stockOut">拣货</a>
    <a class="layui-btn layui-btn-xs" lay-event="stockOut">开始捡货</a>
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
</script>