#

Junjie

6 天以前 7a99dc66a52651adffaa919fb03e73136986b775

#

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

@@ -14,6 +14,14 @@
import com.zy.asrs.utils.MathUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import com.zy.nc.entity.NccCgCgdhdWms;
import com.zy.nc.entity.NccSaleDbddWms;
import com.zy.nc.entity.NccSaleXsfhmxWms;
import com.zy.nc.entity.NccScZkmxbWms;
import com.zy.nc.service.NccCgCgdhdWmsService;
import com.zy.nc.service.NccSaleDbddWmsService;
import com.zy.nc.service.NccSaleXsfhmxWmsService;
import com.zy.nc.service.NccScZkmxbWmsService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +36,10 @@
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderPakoutService orderPakoutService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
@@ -44,6 +56,15 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;

    @Autowired
    private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService;
    @Autowired
    private NccCgCgdhdWmsService nccCgCgdhdWmsService;
    @Autowired
    private NccScZkmxbWmsService nccScZkmxbWmsService;
    @Autowired
    private NccSaleDbddWmsService nccSaleDbddWmsService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -501,4 +522,60 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/restartSyncOrder")
    @ManagerAuth(memo = "重新同步出库订单")
    public R restartSyncOrder(@RequestBody List<Long> ids) {
        if (ids.isEmpty()) {
            return R.error();
        }
        OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectById(ids.get(0));
        if (orderDetlPakout == null) {
            return R.error();
        }

        String orderNoStr = orderDetlPakout.getOrderNo();
        String[] split = orderNoStr.split("-");
        String orderNo = split[0];

        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().like("order_no", orderNo));
        if (!wrkDetls.isEmpty()) {
            return R.error("订单已被执行，无法同步");
        }

        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().like("order_no", orderNo));
        if (!wrkDetlLogs.isEmpty()) {
            return R.error("订单已被执行，无法同步");
        }

        OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
        if(orderPakout == null) {
            return R.error("出库订单不存在");
        }

        if (orderPakout.getDocType$().equals("销售发货")) {
            NccSaleXsfhmxWms nccSaleXsfhmxWms = new NccSaleXsfhmxWms();
            nccSaleXsfhmxWms.setWmsFlag(0);
            nccSaleXsfhmxWmsService.update(nccSaleXsfhmxWms, new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", orderNo));
        } else if (orderPakout.getDocType$().equals("采购到货")) {
            NccCgCgdhdWms nccCgCgdhdWms = new NccCgCgdhdWms();
            nccCgCgdhdWms.setWmsFlag(0);
            nccCgCgdhdWmsService.update(nccCgCgdhdWms, new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", orderNo));
        } else if (orderPakout.getDocType$().equals("转库-出库")) {
            NccScZkmxbWms nccScZkmxbWms = new NccScZkmxbWms();
            nccScZkmxbWms.setWmsFlag(0);
            nccScZkmxbWmsService.update(nccScZkmxbWms, new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", orderNo));
        } else if (orderPakout.getDocType$().equals("调拨出库")) {
            NccSaleDbddWms nccSaleDbddWms = new NccSaleDbddWms();
            nccSaleDbddWms.setWmsFlag(0);
            nccSaleDbddWmsService.update(nccSaleDbddWms, new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", orderNo));
        }

        orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().like("order_no", orderNo));
        orderPakoutService.delete(new EntityWrapper<OrderPakout>().like("order_no", orderNo));

        orderDetlService.delete(new EntityWrapper<OrderDetl>().like("order_no", orderNo));
        orderService.delete(new EntityWrapper<Order>().like("order_no", orderNo));
        return R.ok();
    }

}

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

@@ -117,7 +117,6 @@

    /* 表格2头工具栏点击事件 */
    table.on('toolbar(orderDetlTable)', function (obj) {

        var checkStatus = table.checkStatus(obj.config.id).data;
        if (obj.event === 'pakoutPreview') { // 添加
            if (checkStatus.length === 0) {
@@ -137,9 +136,42 @@
                return d.id;
            });
            doDelSensor({ids: ids});
        } else if (obj.event === 'restartSync') {
            restartSyncOrder(checkStatus.map(function (d) {
                return d.id;
            }))
        }
    });

    function restartSyncOrder(ids) {
        layer.confirm('确定要重新同步该订单数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/order/restartSyncOrder",
                headers: {'token': localStorage.getItem('token')},
                contentType: 'application/json;charset=UTF-8',
                data: JSON.stringify(ids),
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        $(".layui-laypage-btn")[0].click();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })

        });
    }

    /* 表格2工具条点击事件 */
    table.on('tool(orderDetlTable)', function (obj) {
        console.log(obj);

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

@@ -163,6 +163,7 @@
    <!--        </div>-->
    <!--    </div>-->
    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">批量出库</button>
    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-restartSync" lay-event="restartSync">重新同步</button>

</script>