#
luxiaotao1123
2021-02-25 f4d88d94a86b8a067dfad51d5bc8efaf09a2d616
#
8个文件已修改
36 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/NodeService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/WorkService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/NodeMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockIn.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -23,7 +23,7 @@
    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
    public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
        return R.ok("上架成功").add(workService.stockIn(stockInParam, getUserId()));
        return workService.stockIn(stockInParam, getUserId());
    }
src/main/java/zy/cloud/wms/manager/mapper/NodeMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface NodeMapper extends BaseMapper<Node> {
    Node selectByUuid(String uuid);
}
src/main/java/zy/cloud/wms/manager/service/NodeService.java
@@ -5,7 +5,8 @@
public interface NodeService extends IService<Node> {
    String getPathName(Node node);
    Node selectByUuid(String uuid);
}
src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,9 +1,10 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
import zy.cloud.wms.manager.entity.param.StockInParam;
public interface WorkService {
    String stockIn(StockInParam param, Long userId);
    R stockIn(StockInParam param, Long userId);
}
src/main/java/zy/cloud/wms/manager/service/impl/NodeServiceImpl.java
@@ -16,4 +16,9 @@
        }
        return null;
    }
    @Override
    public Node selectByUuid(String uuid) {
        return this.baseMapper.selectByUuid(uuid);
    }
}
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -1,8 +1,12 @@
package zy.cloud.wms.manager.service.impl;
import com.alibaba.fastjson.JSON;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.WorkService;
/**
@@ -11,10 +15,17 @@
@Service("workService")
public class WorkServiceImpl implements WorkService {
    @Autowired
    private NodeService nodeService;
    @Override
    public String stockIn(StockInParam param, Long userId) {
    public R stockIn(StockInParam param, Long userId) {
        Node node = nodeService.selectById(param.getNodeId());
        if (node == null) {
            return R.error("货位不存在");
        }
        System.out.println(JSON.toJSONString(param));
        return null;
    }
}
src/main/resources/mapper/NodeMapper.xml
@@ -26,4 +26,8 @@
    </resultMap>
    <select id="selectByUuid" resultMap="BaseResultMap">
        select * from man_node where 1=1 and uuid=#{uuid} and status = 1
    </select>
</mapper>
src/main/webapp/views/pda/stockIn.html
@@ -175,7 +175,7 @@
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        $('#pakin').focus();
                        // $('#pakin').focus();
                        $('#node-ok').show();
                    } else {
                        $('#node-ok').hide();
@@ -232,10 +232,10 @@
    // 重置
    function reset() {
        $('#code').val("");
        $('#node').val("");
        matData = [];
        tableIns.reload({data: matData});
        $('#node-ok').hide();
        $('#putSiteSelect').val("");
        layui.form.render('select');
    }