#

luxiaotao1123

2021-03-02 d5dfa0ea027ee9f09ffd22911f74e859b97bc4d4

#

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

@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.WorkService;

/**
@@ -22,9 +23,14 @@

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
    public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
    public R stockIn(@RequestBody StockInParam stockInParam) {
        return workService.stockIn(stockInParam, getUserId());
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
    }

}

 src/main/java/zy/cloud/wms/manager/entity/param/StockOutParam.java

New file
@@ -0,0 +1,14 @@
package zy.cloud.wms.manager.entity.param;

import lombok.Data;

/**
 * Created by vincent on 2021/2/25
 */
@Data
public class StockOutParam {

    // 销售订单号
    private String number;

}

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

@@ -2,9 +2,12 @@

import com.core.common.R;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;

public interface WorkService {

    R stockIn(StockInParam param, Long userId);

    R stockOut(StockOutParam param, Long userId);

}

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

@@ -12,6 +12,7 @@
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.CombService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.NodeService;
@@ -74,4 +75,9 @@
        return R.ok();
    }

    @Override
    public R stockOut(StockOutParam param, Long userId) {
        return null;
    }

}

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

@@ -33,7 +33,7 @@
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            // ,{field: 'memo', align: 'center',title: '备注'}

            // ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
        ]],
        request: {
            pageName: 'curr',
@@ -179,6 +179,28 @@
    table.on('tool(custOrder)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            // 拣货
            case 'stockOut':
                layer.confirm(data.number + ' 订单拣货', {shadeClose: true}, function(){
                    layer.closeAll();
                });
                // layer.open({
                //     type: 2,
                //     title: data.number + ' 订单拣货',
                //     maxmin: true,
                //     area: [top.detailWidth, top.detailHeight],
                //     shadeClose: true,
                //     content: 'custOrder_detail.html',
                //     success: function(layero, index){
                //         setFormVal(layer.getChildFrame('#detail', index), data, true);
                //         top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                //         layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
                //         layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                //         layero.find('iframe')[0].contentWindow.layui.form.render('select');
                //         layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                //     }
                // });
                break;
            // 详情
            case 'detail':
                layer.open({

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

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

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</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>

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