#
luxiaotao1123
2021-03-03 ebae1580228ed849f26805dbd0ade1b44d80091f
#
4个文件已修改
1个文件已添加
68 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/WorkService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockOut.html 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -13,6 +13,7 @@
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
@@ -80,4 +81,10 @@
        );
    }
    @RequestMapping("/stock/out/confirm")
    @ManagerAuth(memo = "捡货确认")
    public R stockOutConfirm(@RequestBody StockConfirmParam param) {
        return workService.stockOutComplete(param, getUserId());
    }
}
src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
New file
@@ -0,0 +1,15 @@
package zy.cloud.wms.manager.entity.param;
import lombok.Data;
/**
 * Created by vincent on 2021/3/3
 */
@Data
public class StockConfirmParam {
    private String wrkNo;
    private String number;
}
src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,6 +1,7 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -12,4 +13,6 @@
    R stockOut(StockOutParam param, Long userId);
    R stockOutComplete(StockConfirmParam param, Long userId);
}
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -14,6 +14,7 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.*;
@@ -98,4 +99,11 @@
        return R.ok();
    }
    @Override
    public R stockOutComplete(StockConfirmParam param, Long userId) {
        return R.ok();
    }
}
src/main/webapp/views/pda/stockOut.html
@@ -139,7 +139,6 @@
        })
    }
    layui.use(['laydate', 'form'], function() {
        var $ = layui.jquery;
        var layer = layui.layer;
@@ -147,33 +146,25 @@
    });
    // 拣货确认
    function pakoutConfirm() {
        var tableData = layui.table.checkStatus('tableIdx').data;
        if (tableData.length === 0) {
            tips("请选择物料", true);
            return;
        }
        var site = $('#staNoSelect').val();
        if (null === site || undefined === site || site === "") {
            tips("请选择出库口", true);
        var docNum = pakoutData[0].docNum;
        if (isEmpty(docNum)) {
            tips("请确认单据编号!", true);
            return;
        }
        $.ajax({
            url: baseUrl+"/plate/out/start",
            url: baseUrl+"/work/stock/out/confirm",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                outSite: site,
                locDetls: tableData
                number: docNum
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("启动出库成功")
                    tips("捡货成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
@@ -183,15 +174,15 @@
        })
    }
    // 重置
    function reset() {
        $("#matNo").val("");
        $("#locNo").val("");
        locDetlData = [];
        tableIns.reload({data: locDetlData});
        $('#staNoSelect').val("");
        $("#docNum").val("");
        $('#status').html("未知");
        $('#status').attr("class", "layui-form-label status-0");
        $('#custName').html("-");
        $('#pakout-box').html("");
        pakoutData = [];
        document.getElementById("docNum").focus();
        layui.form.render('select');
    }