*

lsh

8 小时以前 1b79d0f4e8430353342e284e1de6ce220cb4a1f1

*

 src/main/java/com/zy/asrs/controller/OrderPakoutController.java

@@ -243,7 +243,7 @@
    }

    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth(memo = "手动删除订单")
    @ManagerAuth(memo = "手动删除计划组货单")
    @Transactional
    public R delete(@RequestParam Long orderId){
        orderService.remove(orderId);
@@ -258,6 +258,14 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/abandoned/auth")
    @ManagerAuth(memo = "手动废弃计划组货单")
    @Transactional
    public R abandoned(@RequestParam Long orderId){
        orderService.updateSettle(orderId,99L,getUserId());
        return R.ok();
    }

    @RequestMapping(value = "/order/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){

 src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java

@@ -16,6 +16,8 @@

    List<OrderPakout> selectComplete();

    void removeGroupGoodsNoUpdate(@Param("itemName")String itemName,@Param("orderNo")String orderNo);

    int addToLogTable(OrderPakout order);

    List<OrderPakout> selectorderNoL(@Param("orderNo")String orderNo);

 src/main/java/com/zy/asrs/service/OrderPakoutService.java

@@ -22,6 +22,8 @@

    boolean addToLogTable(OrderPakout order);

    void removeGroupGoodsNoUpdate(String a,String orderNo);

    List<OrderPakout> selectorderNoL(String orderNo);

}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -80,6 +80,8 @@
    private LocMastService locMastService;
    @Autowired
    private RgvOneSignService rgvOneSignService;
    @Autowired
    private OrderPakoutService orderPakoutService;

    @Override
    @Transactional
@@ -1207,6 +1209,9 @@
        try{
            List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
            String orderNo = "ZH" + snowflakeIdWorker.nextId();

            orderPakoutService.removeGroupGoodsNoUpdate(param.getGroupGoodsNo(),orderNo);

            for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
                for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
                    OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();

 src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java

@@ -54,6 +54,12 @@
        orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
    }


    @Override
    public void removeGroupGoodsNoUpdate(String itemName,String orderNo) {
        this.baseMapper.removeGroupGoodsNoUpdate(itemName,orderNo);
    }

    @Override
    public List<OrderPakout> selectComplete() {
        return this.baseMapper.selectComplete();

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -341,7 +341,7 @@
                    null,    // 发货时间
                    null,    // 物流名称
                    null,    // 物流单号
                    9L,    // 订单状态
                    10L,    // 订单状态
                    1,    // 状态
                    userId,    // 添加人员
                    now,    // 添加时间

 src/main/resources/mapper/OrderPakoutMapper.xml

@@ -84,4 +84,14 @@
        </if>
    </select>

    <update id="removeGroupGoodsNoUpdate">
        update man_order_pakout
        set settle = 99
        ,update_time = getdate()
        where 1=1
        and item_name = #{itemName}
        and order_no != #{orderNo}
        and (settle = 10 or settle = 98)
    </update>

</mapper>

 src/main/webapp/static/js/orderPakout/order.js

@@ -57,7 +57,7 @@
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},
            {field: 'memo', align: 'center',title: '备注', hide: true},
            {field: 'memo', align: 'center',title: '备注', hide: false},
            {align: 'center', title: '操作', toolbar: '#operate'}
        ]],
        request: {
@@ -176,7 +176,9 @@
            priReduce(data.id);
        } else if (layEvent === 'del') {
            doDel(data.id);
        } else if (layEvent === 'complete') {//转实际组货单
        } else if (layEvent === 'abandoned') {
            doModify(data.id, data.orderNo, 99);
        } else if (layEvent === 'complete') {
            doModify(data.id, data.orderNo, 11);
        } else if (layEvent === 'look') {
            var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -524,6 +526,38 @@
            })
        });
    }
    function doAbandoned(orderId) {
        layer.confirm('确定要废弃计划组货单吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/order/pakout/order/abandoned/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    orderId: orderId
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                        } else {
                            $(".layui-laypage-btn")[0].click();
                        }
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 修改订单状态
    function doModify(orderId, orderNo, settle) {

 src/main/webapp/views/index.html

@@ -168,7 +168,7 @@
            success: function (res) {
                if (res.code == 200) {
                    let days = res.data
                    if (days <= 33) {
                    if (days <= 10) {
                        showPopup(res.data)
                    } else {
                        showPopup("");

 src/main/webapp/views/orderPakout/order.html

@@ -79,13 +79,11 @@
                        <div class="layui-input-inline">
                            <select name="settle">
                                <option value="">选择状态</option>
                                <option value="1">待处理</option>
                                <option value="9">待判查询中</option>
                                <option value="10">就绪</option>
                                <option value="10">待处理</option>
                                <option value="11">生成实际组货单中。请等待...</option>
                                <option value="12">生成实际组货单成功</option>
                                <option value="13">生成实际组货单失败</option>
                                <option value="99">异常</option>
                                <option value="12">待上报</option>
                                <option value="98">异常</option>
                                <option value="99">废弃</option>
                            </select>
                        </div>
                    </div>
@@ -110,12 +108,16 @@

<!-- 表格操作列 -->
<script type="text/html" id="operate">
    {{# if (d.settle != 11) { }}
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>
    {{# if (d.settle == 10 || d.settle == 12) { }}
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="abandoned">废弃</a>
<!--        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>-->
    {{# } }}
    {{# if (d.settle == 10) { }}
        <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">生成实际组货单</a>
    {{# } }}
    {{# if (d.settle == 98) { }}
        <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">重新生成实际组货单</a>
    {{# } }}
</script>
<!-- 表格操作列 -->
<script type="text/html" id="tbLook">