#

mrzhssss

2022-03-16 2facff7a8993d2ff6412ef70e477d3d4996892a6

#

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

@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.ReceiveDetl;
import zy.cloud.wms.manager.entity.ReceiveLog;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.dto.PutShelfDTO;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.ReceiveDetlService;
import zy.cloud.wms.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -21,7 +17,6 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.ReceiveLogService;

import java.util.*;

@@ -36,6 +31,8 @@
    private NodeService nodeService;
    @Autowired
    private ReceiveLogService receiveLogService;
    @Autowired
    private ReceiveService receiveService;

    @RequestMapping(value = "/receiveDetl/{id}/auth")
    @ManagerAuth
@@ -209,8 +206,67 @@
        receiveLog.setBatch(putShelfDTO.getBatch());
        receiveLog.setCreateBy(getUserId());
        receiveLog.setUpdateBy(getUserId());
        receiveLog.setIoType(1);
        receiveLogService.insert(receiveLog);
        return R.ok("添加成功");
    }

    /**
     * 撤销上架操作
     */
    @RequestMapping("/receiveDetl/renew/auth")
    @ManagerAuth
    @Transactional
    public R renew(@RequestBody ReceiveDetl receiveDetl){
        /**
         * 控管
         */
        if (receiveDetl.getInQty() <= 0){
            return R.error("没有上架记录,无法撤回");
        }
        Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
                .eq("id", receiveDetl.getOrderId()));
        if (Cools.isEmpty(receive)) {
            return R.error("找不到该单据,请联系管理员");
        }
        if (receive.getSettle() == 4){
            return R.error("该单据已经完结");
        }

        /**
         * 修改库存数量,同时撤回上架完成后,将操作记录反写回上架统计表 man_receive_log
         */
        List<ReceiveLog> receiveLogs = receiveLogService.selectList(new EntityWrapper<ReceiveLog>()
                .eq("order_no", receiveDetl.getOrderNo())
                .eq("matnr", receiveDetl.getMatnr())
                .eq("batch", receiveDetl.getBatch())
                .eq("io_type", 1));
        if (!Cools.isEmpty(receiveLogs)) {
            return R.error("找不到入库记录");
        }
        for (ReceiveLog receiveLog : receiveLogs) {
            locDetlService.delete(new EntityWrapper<LocDetl>()
                    .eq("loc_no",receiveLog.getNodeName())
                    .eq("matnr",receiveLog.getMatnr())
                    .eq("batch",receiveLog.getBatch()));
            receiveLog.setIoType(101);
            receiveLog.setCreateBy(getUserId());
            receiveLog.setUpdateBy(getUserId());
            receiveLogService.insert(receiveLog);
        }

        /**
         * 反写回入库档
         */
        receiveDetl.setInQty(0);
        receiveDetl.setUpdateTime(new Date());
        receiveDetl.setUpdateBy(getUserId());
        receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
                .eq("id",receiveDetl.getId()));



        return R.ok("撤回成功");
    }

}

 src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java

@@ -13,6 +13,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
@@ -24,6 +26,8 @@
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@AllArgsConstructor
@TableName("man_receive_log")
public class ReceiveLog implements Serializable {

@@ -111,6 +115,9 @@
    @TableField("node_name")
    private String nodeName;

    @TableField("io_type")
    private Integer ioType;

    public ReceiveLog() {}

    public ReceiveLog(String orderNo,Long nodeId,String matnr,Double anfme,String batch,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String nodeName) {

 src/main/resources/mapper/ReceiveLogMapper.xml

@@ -16,6 +16,7 @@
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="node_name" property="nodeName" />
        <result column="io_type" property="ioType" />

    </resultMap>


 src/main/webapp/static/js/receiveDetl/receiveDetl.js

@@ -192,6 +192,9 @@
                // showEditModel(data);
                startIn(data);
                break;
            case "renew":
                renew(data);
                break;
        }
    });
    function startIn(data) {
@@ -325,6 +328,35 @@
        });
    }

    function renew(data) {
        console.log(data)
        layer.confirm('确定要撤回全部上架数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/receiveDetl/renew/auth",
                headers: {'token': localStorage.getItem('token')},
                data: JSON.stringify(data),
                contentType:'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;

 src/main/webapp/views/receiveDetl/receiveDetl.html

@@ -44,6 +44,7 @@
<script type="text/html" id="operate">
    <!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>-->
    <a class="layui-btn  layui-btn-normal layui-btn-xs btn-edit" lay-event="add">上架</a>
    <a class="layui-btn  layui-btn-danger layui-btn-xs btn-edit" lay-event="renew">撤销上架</a>
    <!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>-->
</script>

@@ -154,6 +155,10 @@
        </div>
    </form>
</script>

<script type="text/html" id="renew">

</script>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form">