13

zhang

2025-05-26 1a0409e260b79b030f79a4fad995078a7f1b945c

13

 src/main/java/com/zy/nc/task/PlanOrderTask.java

@@ -178,7 +178,7 @@
    public void execute4() {
        List<String> strings = nccCkPddWmsService.selectPdd();
        for (String string : strings) {
            List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
            List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG",4).eq("hdr", 0).eq("bdr", 0));
            ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
            if (!returnT.isSuccess()) {
                for (NccCkPddWms wms : wmsFlag) {

 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java

@@ -24,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Service
@@ -229,7 +230,10 @@
                inventoryCheckOrderDetlService.insert(checkOrderDetl);
                nccScZkmxbWms.setWmsFlag(1);
                param.setOrderNo(nccScZkmxbWms.getVbillcode());
                param.setCreateBy(nccScZkmxbWms.getPdrmc());

            }
            param.setCreateTime(new Date());
            param.setStatus("1");
            inventoryCheckOrderService.insert(param);
            nccCkPddWmsService.updateBatchById(wmsFlag);

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

@@ -79,6 +79,13 @@
        insTb.reload({where: data.field, page: {curr: 1}});
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 添加
    $("#orderAddBtn").click(function () {
        showEditModel();
@@ -546,3 +553,14 @@
        ,range: true
    });
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    insTb.reload({
        where: searchData,
        page: {curr: pageCurr}
    });
}

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

@@ -79,6 +79,13 @@
        insTb.reload({where: data.field, page: {curr: 1}});
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 添加
    $("#orderAddBtn").click(function () {
        showEditModel();
@@ -546,3 +553,14 @@
        ,range: true
    });
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    insTb.reload({
        where: searchData,
        page: {curr: pageCurr}
    });
}

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

@@ -79,6 +79,13 @@
        insTb.reload({where: data.field, page: {curr: 1}});
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 添加
    $("#orderAddBtn").click(function () {
        showEditModel();
@@ -546,3 +553,14 @@
        ,range: true
    });
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    insTb.reload({
        where: searchData,
        page: {curr: pageCurr}
    });
}

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

@@ -46,7 +46,7 @@
    <div class="layui-card">
        <div class="layui-card-body">
            <!-- 表格顶部工具栏 -->
            <div class="layui-form toolbar">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
@@ -78,6 +78,9 @@
                    <div class="layui-inline">
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                        </button>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js?v=3" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js?v=6" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>

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

@@ -46,7 +46,7 @@
    <div class="layui-card">
        <div class="layui-card-body">
            <!-- 表格顶部工具栏 -->
            <div class="layui-form toolbar">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
@@ -79,8 +79,11 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
<!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加-->
<!--                        </button>-->
                    </div>
                </div>
            </div>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderPakin/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderPakin/order.js?v=1" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>

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

@@ -46,7 +46,7 @@
    <div class="layui-card">
        <div class="layui-card-body">
            <!-- 表格顶部工具栏 -->
            <div class="layui-form toolbar">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
@@ -79,8 +79,11 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
<!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加-->
<!--                        </button>-->
                    </div>
                </div>
            </div>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderPakout/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderPakout/order.js?v=2" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>