#

lsh

2025-04-07 bf50baf41cce651cfaf951056e976aefc077a757

#

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

@@ -365,7 +365,22 @@
        }
        return R.ok();
    }

    @RequestMapping(value = "/order/priAdd/auth")
    @ManagerAuth(memo = "手动增加订单优先级")
    @Transactional
    public R priAdd(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        wrkMastService.orderAddPri(order.getOrderNo());
        return R.ok();
    }
    @RequestMapping(value = "/order/priReduce/auth")
    @ManagerAuth(memo = "手动减少订单优先级")
    @Transactional
    public R priReduce(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        wrkMastService.orderReducePri(order.getOrderNo());
        return R.ok();
    }
    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth(memo = "手动删除订单")
    @Transactional

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

@@ -4,6 +4,7 @@
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -19,6 +20,10 @@
    List<WrkMast> selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData2();

    int orderAddPri(@Param("orderNo") String orderNo);

    int orderReducePri(@Param("orderNo") String orderNo);

    // work log -------------------------------------------------------
    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);

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

@@ -25,4 +25,8 @@
    int getStoreCount(Integer crnNo);

    int saveWrkMastLog(Integer workNo);

    int orderAddPri(String orderNo);

    int orderReducePri(String orderNo);
}

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

@@ -444,9 +444,9 @@
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID

            Integer pri = YyyyMmddUtils.convertPri(nowPri);
            wrkMast.setIoType(pri); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            double pri = YyyyMmddUtils.convertPriD(nowPri);
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(pri); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站

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

@@ -61,4 +61,14 @@
        return this.baseMapper.saveWrkMastLog(workNo);
    };

    @Override
    public int orderAddPri(String orderNo) {
        return this.baseMapper.orderAddPri(orderNo);
    }

    @Override
    public int orderReducePri(String orderNo) {
        return this.baseMapper.orderReducePri(orderNo);
    }

}

 src/main/java/com/zy/common/utils/YyyyMmddUtils.java

@@ -53,7 +53,7 @@
    }

    // 原方法改造（带 Date 参数）
    public static long convertYyyyMMdd100000ioPri(Date data) {
    public static long convertPriL(Date data) {
        long ioPri = convertYyyyMMdd100000(data);
        long secondsOfDay = getSecondsOfDay(data);
        System.out.println(secondsOfDay);
@@ -62,19 +62,32 @@

    // 重载方法（兼容无 Date 参数的调用）
    public static long convertYyyyMMdd1000000ioPri() {
        return convertYyyyMMdd100000ioPri(new Date());
        return convertPriL(new Date());
    }

    // 重载方法（兼容无 Date 参数的调用）
    public static Integer convertPri(Date date) {
        long datePri = convertYyyyMMdd100000ioPri(date);
    public static Integer convertPriI(Date date) {
        long datePri = convertPriL(date);
        return (int)datePri;
    }

    // 重载方法（兼容无 Date 参数的调用）
    public static Double convertPriD(Date date) {
        long datePri = convertPriL(date);
        return (double)datePri;
    }

    public static void main(String[] args) {
        Date now = new Date();
        long result = YyyyMmddUtils.convertYyyyMMdd100000ioPri(now);
        System.out.println("计算值：" + result);
        System.out.println("计算值：" + (int)result);
        long resultl = YyyyMmddUtils.convertPriL(now);
        Integer resultI= YyyyMmddUtils.convertPriI(now);
        Double resultD = YyyyMmddUtils.convertPriD(now);
        System.out.println("resultl计算值：" + resultl);
        System.out.println("resultl计算值：" + (resultl+0.0));
        System.out.println("resultl计算值：" + (double)resultl);
        System.out.println("resultI计算值：" + resultI);
        System.out.println("resultI计算值：" + resultI);
        System.out.println("resultD计算值：" + resultD);
        System.out.println("resultD计算值：" + resultD);
    }
}

 src/main/resources/mapper/WrkMastMapper.xml

@@ -89,4 +89,27 @@
        order by io_time,wrk_no asc
    </select>

    <update id="orderAddPri">
        UPDATE asr_wrk_mast
        SET io_pri = io_pri + 100000
        WHERE 1=1
          AND wrk_no IN (
            SELECT wrk_no
            FROM asr_wrk_detl
            WHERE order_no = #{orderNo}
        );
    </update>

    <update id="orderReducePri">
        UPDATE asr_wrk_mast
        SET io_pri = io_pri - 100000
        WHERE 1=1
          AND io_pri >= 100001
          AND wrk_no IN (
            SELECT wrk_no
            FROM asr_wrk_detl
            WHERE order_no = #{orderNo}
        );
    </update>

</mapper>

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

@@ -56,7 +56,7 @@
            {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},
            {align: 'center', title: '操作', toolbar: '#operate', width: 240}
            {align: 'center', title: '操作', toolbar: '#operate'}
        ]],
        request: {
            pageName: 'curr',
@@ -168,6 +168,10 @@
            showEditModel(data);
        } else if (layEvent === 'wrkTrace') {
            showWrkTrace(data.id);
        } else if (layEvent === 'priAdd') {
            priAdd(data.id);
        } else if (layEvent === 'priReduce') {
            priReduce(data.id);
        } else if (layEvent === 'del') {
            doDel(data.id);
        } else if (layEvent === 'labelUp') {
@@ -529,6 +533,70 @@
    }

    // 删除单据
    function priAdd(orderId) {
        layer.confirm('确定要增加此订单优先级吗？点一下加100000', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/order/priAdd/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 priReduce(orderId) {
        layer.confirm('确定要增加此订单优先级吗？点一下减100000', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/order/priReduce/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 doDel(orderId) {
        layer.confirm('确定要删除吗？', {
            shade: .1,

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

@@ -132,6 +132,8 @@
    {{# if (d.settle == 2) { }}
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">上传标签</a>
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">完结</a>
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="priAdd">增加优先级</a>
    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="priReduce">降低优先级</a>
    {{# } }}
    {{# if (d.settle == 4 && d.tkType=='1') { }}
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="refundLoc">退库</a>

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -97,7 +97,7 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon">&#xe624;</i>sheet</button>
<!--        <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon">&#xe624;</i>sheet</button>-->
        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>增加优先级</button>
        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>降低优先级</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>