*

lsh

12 小时以前 72149078ff14f391cdd3c312b74455e441630343

*

 src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java

@@ -1,11 +1,9 @@
package com.zy.asrs.task;

import com.core.common.Cools;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.GroupOrderFormHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -15,7 +13,7 @@

/**
 * Created by Monkey D. Luffy on 2025.11.10
 * 徐工汉云..............以下.............上饶江铜.............拆垛完成信息处理
 * 徐工汉云..............以下.............上饶江铜.............组货单相关
 */
@Slf4j
@Component

 src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java

@@ -6,9 +6,9 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.param.OrderCargoBookingNoteParam;
import com.zy.asrs.entity.param.OrderInspectionRollParam;
import com.zy.asrs.entity.param.OrderOutLocBoxCsUtilParam;
import com.zy.asrs.service.*;
@@ -29,7 +29,7 @@

/**
 * Created by Monkey D. Luffy on 2025.11.10
 * 徐工汉云..............以下.............上饶江铜.............拆垛完成信息处理
 * 徐工汉云..............以下.............上饶江铜.............组货单相关
 */
@Slf4j
@Service
@@ -42,6 +42,8 @@
    private ApiLogService apiLogService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private LocDetlService locDetlService;

    @Transactional
    public ReturnT<String> abandoned(OrderPakout orderPakout) {
@@ -75,16 +77,41 @@
        List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
        String memo = "";
        for (OrderDetlPakout orderDetl : orderDetls) {
            boolean signD = true;
            if (!CodeDetectionUtil.barcodeDetection(orderDetl.getManu(),7)){
                if (Cools.isEmpty(memo)){
                    memo = "无库存";
                }else {
                    memo = memo+";无库存";
                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", orderDetl.getModel()));
                if (!Cools.isEmpty(locDetl)){
                    signD = false;
                    orderDetl.sync(locDetl);
                    orderDetl.setManu(locDetl.getLocNo());
                    orderDetl.setBarcode(locDetl.getBarcode());
                    orderDetl.setDanger(locDetl.getDanger());
                    orderDetl.setMemo(locDetl.getMemo());
                    if (!Cools.isEmpty(locDetl.getDanger$()) && locDetl.getDanger()==1){
                        orderDetl.setDanger(1);
                        orderDetlPakoutService.updateById(orderDetl);
                        continue;
                    }
                } else {
                    if (Cools.isEmpty(memo)){
                        memo = "无库存";
                    }else {
                        memo = memo+";无库存";
                    }
                    continue;
                }
                continue;
            }
            if (Cools.isEmpty(orderDetl.getDanger$()) || orderDetl.getDanger()==1){//合格不需要检验
                continue;
            if (signD){
                if (!Cools.isEmpty(orderDetl.getDanger$()) && orderDetl.getDanger()==1){//合格不需要检验
                    continue;
                } else {
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", orderDetl.getModel()));
                    if (!Cools.isEmpty(locDetl.getDanger$()) && locDetl.getDanger()==1){
                        orderDetl.setDanger(1);
                        orderDetlPakoutService.updateById(orderDetl);
                        continue;
                    }
                }
            }
            OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
            String response = "";
@@ -103,7 +130,7 @@
                        if (value.equals("合格")){
                            orderDetl.setDanger(1);
                            orderDetlPakoutService.updateById(orderDetl);
                        } else if (value.equals(orderDetl.getDanger$())){
                        } else if (!Cools.isEmpty(orderDetl.getDanger$()) && value.equals(orderDetl.getDanger$())){
                            if (Cools.isEmpty(memo)){
                                memo = "查询卷号结果："+jsonObject.getString("message");
                            }else {

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

@@ -176,8 +176,10 @@
            priReduce(data.id);
        } else if (layEvent === 'del') {
            doDel(data.id);
        } else if (layEvent === 'inspection') {
            doModify(data.id, data.orderNo, 12);
        } else if (layEvent === 'abandoned') {
            doModify(data.id, data.orderNo, 99);
            doAbandoned(data.id);
        } else if (layEvent === 'complete') {
            doModify(data.id, data.orderNo, 11);
        } else if (layEvent === 'look') {

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

@@ -81,7 +81,7 @@
                                <option value="">选择状态</option>
                                <option value="10">待处理</option>
                                <option value="11">检验中</option>
                                <option value="12">检验合格</option>
                                <option value="12">出库中</option>
                                <option value="13">存在不合格</option>
                                <option value="15">待上报</option>
                                <option value="16">上报完成</option>