*

lsh

13 小时以前 5829b04e534b0779b1e67993bc3246adcecaf164

*

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

@@ -330,10 +330,11 @@
            return R.error("用户异常").add("用户异常");
        }
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("model", model));
        OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
//        OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
        String response = "";
        boolean success = false;
        Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
        Map<String, Object> params = new HashMap<>();
        params.put("batchNo", model);
        try {
            response = new HttpHandler.Builder()
                    .setUri(qualityFinishedCheckoutUrl)
@@ -375,7 +376,7 @@
                        qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(orderInspectionRollParam),
                        JSON.toJSONString(params),
                        response,
                        success
                );

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

@@ -25,10 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * Created by Monkey D. Luffy on 2025.11.10
@@ -145,10 +142,13 @@

                }
            }
            OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
//            OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
            String response = "";
            boolean success = false;
            Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
//            Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);

            Map<String, Object> params = new HashMap<>();
            params.put("batchNo", orderDetl.getModel());
            try {
                response = new HttpHandler.Builder()
                        .setUri(qualityFinishedCheckoutUrl)
@@ -189,7 +189,7 @@
                    }else {
                        memo = memo+";卷号"+ orderDetl.getModel()+"查询结果："+jsonObject.getString("message");
                    }
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout, JSON.toJSONString(orderInspectionRollParam), response);
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout, JSON.toJSONString(params), response);
//                    throw new CoolException("查询卷号是否合格失败");
                }
            } catch (Exception e) {
@@ -209,7 +209,7 @@
                            qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(orderInspectionRollParam),
                            JSON.toJSONString(params),
                            response,
                            success
                    );

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -42,7 +42,7 @@
    // cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间'}
        ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
        ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:160}

    )
    return cols;
@@ -261,22 +261,15 @@
                    }
                });
                break;
            case 'edit':
            case 'inspection':
                var model = top.reObject(data).model;
                if (model === undefined) {
                    layer.msg("无数据");
                }
                this.$confirm(
                    '确认向MES校准是否合格？',
                    '确认修改',
                    {
                        confirmButtonText: '确认',
                        cancelButtonText: '取消',
                        type: 'warning',
                        dangerouslyUseHTMLString: true
                    }
                ).then(() => {
                    // 调用后台API上报数据
                layer.confirm('确认向MES校准是否合格', {
                    shade: .1,
                    skin: 'layui-layer-admin'
                }, function (i) {
                    $.ajax({
                        url: baseUrl + "/actual/shipment/locDetl/report/auth",
                        headers: {'token': localStorage.getItem('token')},
@@ -284,40 +277,22 @@
                            model: model // 传递组货单号
                        },
                        method: 'POST',
                        success: (res) => {
                            this.reportLoading = false;
                            if (typeof done === 'function') {
                                done();
                            }
                            if (res.code === 200 || res.success) {
                                this.$message({
                                    message: `组货单号 ${groupOrderNo} 上报成功`,
                                    type: 'success',
                                    duration: 3000
                                });
                                // 上报成功后关闭弹窗并刷新数据
                                setTimeout(() => {
                                    this.closeDetailDialog();
                                    this.getTableDataA(); // 刷新主表数据
                                }, 1500);
                        success: function (res) {
                            layer.closeAll('loading');
                            if (res.code === 200){
                                if (insTbCount === 0) {
                                    insTb.reload({page: {curr: 1}});
                            } else {
                                this.$message.error(res.message || '上报失败');
                                    $(".layui-laypage-btn")[0].click();
                            }
                        },
                        error: (error) => {
                            this.reportLoading = false;
                            if (typeof done === 'function') {
                                done();
                                layer.msg(res.msg, {icon: 1});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                            console.error('上报失败:', error);
                            this.$message.error('上报失败，请检查网络连接');
                        }
                    });
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '已取消修改'
                    });
                    })
                });
                break;
            case 'locNo':