#
luxiaotao1123
2021-03-24 454e10394b27f49b21e808bb2a5f30ffc91c2240
#
1个文件已添加
4个文件已修改
33 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/param/StoCheckParam.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/WorkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockCheck.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -144,4 +144,10 @@
        return workService.stockTransfer(number, getUserId());
    }
    @RequestMapping("/stock/check")
    @ManagerAuth(memo = "库存盘点")
    public R stockCheck(@RequestBody StoCheckParam param) {
        return workService.stockCheck(param, getUserId());
    }
}
src/main/java/zy/cloud/wms/manager/entity/param/StoCheckParam.java
New file
@@ -0,0 +1,10 @@
package zy.cloud.wms.manager.entity.param;
import lombok.Data;
/**
 * Created by vincent on 2021/3/24
 */
@Data
public class StoCheckParam {
}
src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -29,4 +29,6 @@
    R stockTransfer(String number, Long userId);
    R stockCheck(StoCheckParam param, Long userId);
}
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -412,4 +412,11 @@
        return R.error("暂不缺货,不需要立库调拨");
    }
    @Override
    public R stockCheck(StoCheckParam param, Long userId) {
        return R.ok();
    }
}
src/main/webapp/views/pda/stockCheck.html
@@ -72,7 +72,7 @@
<footer>
    <div class="layui-btn-container">
        <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">重置</button>
        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">组托</button>
        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="check()" style="margin-left: 20px">确认</button>
        <span id="tips"></span>
    </div>
</footer>
@@ -292,8 +292,8 @@
        tableIns.reload({data: locDetlData});
    }
    // 组托
    function comb() {
    // 确认
    function check() {
        var barcode = $('#code').val();
        if (isEmpty(barcode)) {
            tips("托盘条码为空", true);
@@ -310,7 +310,7 @@
        }
        var billNo = $('#billNo').val();
        $.ajax({
            url: baseUrl+"/mobile/comb/auth",
            url: baseUrl+"/work/stock/check",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,