*

lsh

13 小时以前 0b5dc6887e46ac956b5b783c70244d40589fbd25

*

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

@@ -2,6 +2,7 @@

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -15,12 +16,18 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.OrderInspectionRollParam;
import com.zy.asrs.entity.param.QualityGroupListParam;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -38,6 +45,13 @@
    private LocDetlMapper locDetlMapper;
    @Autowired
    private MatService matService;
    @Autowired
    private ApiLogService apiLogService;

    @Value("${srXghyMes.qualityFinishedCheckoutUrl}")
    private String qualityFinishedCheckoutUrl;
    @Value("${srXghyMes.qualityFinishedCheckout}")
    private String qualityFinishedCheckout;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -303,4 +317,71 @@
        return R.ok(sum);
    }

    @RequestMapping(value = "/actual/shipment/locDetl/report/auth")
    @ManagerAuth(memo = "卷号是否合格手动校验")
    public R actualShipmentLocDetl(@RequestParam String model) {
        Long userId = null;
        try {
            userId = getUserId();
            if (Cools.isEmpty(userId)) {
                return R.error("用户异常").add("用户异常");
            }
        } catch (Exception e){
            return R.error("用户异常").add("用户异常");
        }
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("model", model));
        OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
        String response = "";
        boolean success = false;
        Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
        try {
            response = new HttpHandler.Builder()
                    .setUri(qualityFinishedCheckoutUrl)
                    .setPath(qualityFinishedCheckout)
                    .setParams(params)
                    .setUseFormUrlEncoded(true)
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getBoolean("state")) {
                String value = jsonObject.getString("value");
                if (value.equals("合格")){
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(1);
                        locDetlService.updateById(locDetl);
                    }
                } else if (value.equals("不合格")){
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(2);
                        locDetlService.updateById(locDetl);
                    }
                } else {
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(0);
                        locDetlService.updateById(locDetl);
                    }
                }
                success = true;
            } else {
                return R.error("查询卷号是否合格失败");
            }
        } catch (Exception e) {
            return R.error("查询卷号是否合格失败"+e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "查询卷号是否合格",
                        qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(orderInspectionRollParam),
                        response,
                        success
                );
            } catch (Exception e) { }
        }
        return R.error("上报失败").add("上报失败");
    }

}

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

@@ -158,7 +158,6 @@
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
                    if (jsonObject.getBoolean("state")) {
                        String value = jsonObject.getString("value");
                        if (value.equals("合格")){
@@ -182,13 +181,6 @@
                                orderDetlPakoutService.updateById(orderDetl);
                            }
                            continue;
                        }
                    } else {
                        if (Cools.isEmpty(memo)){
                            memo = "卷号"+ orderDetl.getModel()+"查询结果："+jsonObject.getString("message");
                        }else {
                            memo = memo+";卷号"+ orderDetl.getModel()+"查询结果："+jsonObject.getString("message");
                        }
                    }
                    success = true;
                } else {

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

@@ -261,6 +261,65 @@
                    }
                });
                break;
            case 'edit':
                var model = top.reObject(data).model;
                if (model === undefined) {
                    layer.msg("无数据");
                }
                this.$confirm(
                    '确认向MES校准是否合格？',
                    '确认修改',
                    {
                        confirmButtonText: '确认',
                        cancelButtonText: '取消',
                        type: 'warning',
                        dangerouslyUseHTMLString: true
                    }
                ).then(() => {
                    // 调用后台API上报数据
                    $.ajax({
                        url: baseUrl + "/actual/shipment/locDetl/report/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {
                            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);
                            } else {
                                this.$message.error(res.message || '上报失败');
                            }
                        },
                        error: (error) => {
                            this.reportLoading = false;
                            if (typeof done === 'function') {
                                done();
                            }
                            console.error('上报失败:', error);
                            this.$message.error('上报失败，请检查网络连接');
                        }
                    });
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '已取消修改'
                    });
                });
                break;
            case 'locNo':
                var param = top.reObject(data).locNo;
                if (param === undefined) {

 src/main/webapp/views/locDetl/locDetl.html

@@ -78,6 +78,7 @@
<script type="text/html" id="operate">
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="inspection">检验</a>

</script>