#
luxiaotao1123
2021-02-25 365a97f64f9f9db2151222c8041c5fa92a67a47a
#
4个文件已添加
1个文件已修改
101 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/WorkService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockIn.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
New file
@@ -0,0 +1,30 @@
package zy.cloud.wms.manager.controller;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
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.service.WorkService;
/**
 * Created by vincent on 2021/2/25
 */
@RestController
@RequestMapping("/work")
public class WorkController extends BaseController {
    @Autowired
    private WorkService workService;
    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
    public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
        return R.ok("上架成功").add(workService.stockIn(stockInParam, getUserId()));
    }
}
src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java
New file
@@ -0,0 +1,15 @@
package zy.cloud.wms.manager.entity.param;
import lombok.Data;
/**
 * Created by vincent on 2021/2/25
 */
@Data
public class StockInParam {
    private Long nodeId;
    private String zpallet;
}
src/main/java/zy/cloud/wms/manager/service/WorkService.java
New file
@@ -0,0 +1,9 @@
package zy.cloud.wms.manager.service;
import zy.cloud.wms.manager.entity.param.StockInParam;
public interface WorkService {
    String stockIn(StockInParam param, Long userId);
}
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
New file
@@ -0,0 +1,20 @@
package zy.cloud.wms.manager.service.impl;
import com.alibaba.fastjson.JSON;
import org.springframework.stereotype.Service;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.service.WorkService;
/**
 * Created by vincent on 2021/2/25
 */
@Service("workService")
public class WorkServiceImpl implements WorkService {
    @Override
    public String stockIn(StockInParam param, Long userId) {
        System.out.println(JSON.toJSONString(param));
        return null;
    }
}
src/main/webapp/views/pda/stockIn.html
@@ -148,6 +148,7 @@
            success: function (res) {
                if (res.code === 200) {
                    if (res.data.length > 0) {
                        matData = res.data;
                        tableIns.reload({data: res.data});
                        $('#node').focus();
                    }
@@ -238,34 +239,28 @@
        layui.form.render('select');
    }
    // 入库
    // 上架
    function pakIn() {
        var barcode = $('#code').val();
        if (isEmpty(barcode)) {
        var zpallet = $('#code').val();
        if (isEmpty(zpallet)) {
            tips("托盘条码为空", true);
            return;
        }
        if (barcode.length !== 7) {
            tips("条码必须为7位", true);
        var node = $('#node').val();
        if (isEmpty(node)) {
            tips("货位为空", true);
            return;
        }
        if (matData.length === 0) {
            tips("请提取物料", true);
            return;
        }
        // var site = $('input:radio[name="site"]:checked').next("span").html();
        var site = $('#putSiteSelect').val();
        if (null === site || undefined === site || site === "") {
            tips("请选择入库口", true);
            return;
        }
        $.ajax({
            url: baseUrl+"/full/store/put/start",
            url: baseUrl+"/work/stock/in",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,
                devpNo: site,
                list: matData
                nodeId: node,
                zpallet: zpallet
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
@@ -273,7 +268,7 @@
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("入库启动成功")
                    tips("上架成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {