src/main/java/com/zy/api/controller/KopenApiController.java

@@ -1,12 +1,16 @@
package com.zy.api.controller;


import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
import com.zy.common.web.BaseController;

import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

@@ -24,7 +28,7 @@
@Slf4j
@RestController
@RequestMapping("/kopen")
public class KopenApiController {
public class KopenApiController  extends BaseController{

    @Autowired
    private KopenApiService kopenApiService;
@@ -145,6 +149,37 @@
    }


    
    /**
     * 查询WMS库存信息
     * @author Ryan
     * @date 2025/11/24 15:22
     * @param params
     * @return com.core.common.R
     */
    @ApiOperation("查询WMS库存信息")
    @PostMapping("/getStockInfo")
    public XSR getStockInfo(@RequestBody PageRequestParams params) {
        return kopenApiService.getStockInfo(params);
    }


    /**
     * 零件损溢单下发
     * @author Ryan
     * @date 2025/11/24 15:22
     * @param params
     * @return com.core.common.R
     */
    @ApiOperation("零件损溢单下发")
    @PostMapping("/sendBSBYDetails")
    public XSR sendStockAdjust(@RequestBody StockAdjustParams params) {
        if (Objects.isNull(params)) {
            return XSR.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
            return XSR.error("上报订单列表不能为空！！");
        }
        return kopenApiService.sendStockAdjust(params, 1L);
    }

}

 src/main/java/com/zy/api/entity/OrderItemsParam.java

@@ -6,7 +6,6 @@
import lombok.experimental.Accessors;
import java.io.Serializable;


@Data
@Accessors(chain = true)
@ApiModel(value = "OrderItemsParam", description = "订单明细参数")
@@ -42,4 +41,10 @@
    @ApiModelProperty("捆绑/叫料/数量数量")
    private Integer pick_qty;

    @ApiModelProperty("损溢数量")
    private Integer bsby_qty;

    @ApiModelProperty("托盘编号")
    private String location_no;

}

 src/main/java/com/zy/api/entity/dto/XSR.java

@@ -23,7 +23,7 @@

    private String returnMessage;

    private T data;
    private T result;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -47,7 +47,7 @@
                .setSuccess(true)
                .setMessage("操作成功")
                .setReturnMessage("操作成功")
                .setData(data);
                .setResult(data);
    }

    public static <T> XSR<T> ok(T data, String message) {
@@ -56,7 +56,7 @@
                .setSuccess(true)
                .setMessage(message)
                .setReturnMessage(message)
                .setData(data);
                .setResult(data);
    }

    public static <T> XSR<T> error(String message) {

 src/main/java/com/zy/api/service/KopenApiService.java

@@ -2,8 +2,11 @@

import java.util.List;

import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
@@ -59,4 +62,22 @@
     * @return com.core.common.R
     */
    XSR getOutDetails(StockUpOrderParams params);

    /**
     * 查询WMS库存信息
     * @author Ryan
     * @date 2025/11/24 15:22
     * @param params
     * @return com.core.common.R
     */
    XSR getStockInfo(PageRequestParams params);

    /**
     * 零件损溢单下发
     * @author Ryan
     * @date 2025/11/24 15:22
     * @param params
     * @return com.core.common.R
     */
    XSR sendStockAdjust(StockAdjustParams params, Long userId);
}

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -2,12 +2,16 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.OutOrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
@@ -15,12 +19,18 @@
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.CheckOrder;
import com.zy.asrs.entity.CheckOrderDetl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.OrderSettle;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.CheckOrderDetlService;
import com.zy.asrs.service.CheckOrderService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
@@ -32,6 +42,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -46,6 +57,14 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private CheckOrderService checkOrderService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CheckOrderDetlService checkOrderDetlService;

    /**
     * 接收下发订单信息
@@ -320,6 +339,7 @@
                // 备货单出库
                newOrder.setOrderNo(params.getPick_no());
                newOrder.setNumber(params.getDispatch_no());
                newOrder.setShipCode(params.getOrder_no());
                newOrder.setCstmrName(params.getCus_id());
                newOrder.setTel(params.getCus_address());
                newOrder.setDocType(Long.parseLong(OrderTypeEnum.STOCK.type + ""));
@@ -444,4 +464,116 @@
        return XSR.ok("备货单下发成功！！");
    }

    /**
     * 查询WMS库存信息
     *
     * @param params
     * @return com.core.common.R
     */
    @Override
    public XSR getStockInfo(PageRequestParams params) {
        Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()),
                new EntityWrapper<LocDetl>()
                        .eq(!Objects.isNull(params.getPro_komcode()), "matnr", params.getPro_komcode())
                        .eq(Objects.isNull(params.getPro_id()), "supp_code", params.getPro_id()));

        return XSR.ok(locDetls.getRecords());
    }

    /**
     * 零件损溢单下发
     * 
     * @author Ryan
     * @date 2025/11/24 15:22
     * @param params
     * @return com.core.common.R
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public XSR sendStockAdjust(StockAdjustParams params, Long userId) {
        if (Objects.isNull(params)) {
            return XSR.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
            return XSR.error("订单明细不能为空！！");
        }
        // 校验参数
        if (Objects.isNull(params.getBsby_no())) {
            return XSR.error("损溢单编号不能为空！！");
        }

        CheckOrder checkOrder = checkOrderService
                .selectOne(new EntityWrapper<CheckOrder>().eq("order_no", params.getBsby_no()));
        if (!Objects.isNull(checkOrder)) {
            return XSR.error("损溢单已存在！！");
        }

        gentCheckOrders(params, userId);

        return XSR.ok("零件损溢单下发成功！！");
    }

    /** 生成新的零件损溢单 
     * @param userId */
    @Transactional(rollbackFor = Exception.class)   
    public void gentCheckOrders(StockAdjustParams checkOrder, Long userId) {
        CheckOrder order = new CheckOrder();
        order.setOrderNo(checkOrder.getBsby_no());
        order.setCstmrName(checkOrder.getCompany_id());
        order.setDefNumber(checkOrder.getKopen_id());
        order.setDocType(4L);
        order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        order.setSettle(Long.valueOf(CommonEnum.COMMON_ENUM_Y.type + ""));
        order.setStatus(CommonEnum.COMMON_ENUM_Y.type);
        order.setOrderTime(checkOrder.getUpdate_time());
        order.setMemo(checkOrder.getResason());
        order.setShipName(checkOrder.getReason_name());
        order.setCreateTime(new Date());
        order.setUpdateTime(new Date());

        if (!checkOrderService.insert(order)) {
            throw new CoolException("损溢单新增失败！！");
        }

        if (Objects.isNull(checkOrder.getDetails()) || checkOrder.getDetails().isEmpty()) {
            throw new CoolException("订单明细不能为空！！");
        }

        checkOrder.getDetails().forEach(item -> {
            CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
            //通过托盘， 物料编码， 供应商编码查询库存明细
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                    .eq("matnr", item.getPro_komcode())
                    .eq("zpallet", item.getLocation_no())
                    .eq("supp_code", item.getPro_id()));
            if (Objects.isNull(locDetl)) {
                throw new CoolException("库存不存在！！");
            }
            BeanUtils.copyProperties(locDetl, checkOrderDetl);
            checkOrderDetl.setLocDetlId(locDetl.getId());
            checkOrderDetl.setOrderId(order.getId());
            checkOrderDetl.setOrderNo(order.getOrderNo());
            checkOrderDetl.setMatnr(locDetl.getMatnr());
            checkOrderDetl.setMaktx(locDetl.getMaktx());
            checkOrderDetl.setBatch(locDetl.getBatch());
            checkOrderDetl.setSpecs(locDetl.getSpecs());
            checkOrderDetl.setThreeCode(locDetl.getThreeCode());
            checkOrderDetl.setSuppCode(locDetl.getSuppCode());
            checkOrderDetl.setStandby1(locDetl.getSuppCode());
            checkOrderDetl.setAnfme(new BigDecimal(locDetl.getAnfme().toString()));
            checkOrderDetl.setDiffQty(BigDecimal.ZERO);
            checkOrderDetl.setWorkQty(BigDecimal.ZERO);
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(userId);
            checkOrderDetl.setCreateTime(new Date());
            checkOrderDetl.setUpdateBy(userId);
            checkOrderDetl.setUpdateTime(new Date());

            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");
            }
        });
    }

}

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

@@ -991,7 +991,7 @@
                try {
                    response = new HttpHandler.Builder()
                            .setUri(MesConstant.URL)
                            .setPath(MesConstant.PACK_DOWN_URL)
                            .setPath(MesConstant.IN_DISPATCH_RESULT)
                            .setJson(JSON.toJSONString(mesCombParam))
                            .build()
                            .doPost();
@@ -999,11 +999,11 @@
                    if (jsonObject.getInteger("code").equals(200)) {
                        success = true;
                    } else if (jsonObject.getInteger("code").equals(500)) {
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PACK_DOWN_URL,
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
                                JSON.toJSONString(mesCombParam), response);
                        throw new CoolException(jsonObject.getString("msg"));
                    } else {
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PACK_DOWN_URL,
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
                                JSON.toJSONString(mesCombParam), response);
                        throw new CoolException("上报mes系统失败");
                    }
@@ -1015,7 +1015,7 @@
                        // 保存接口日志
                        apiLogService.save(
                                "打包下线帮托上报",
                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
                                MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
                                null,
                                "127.0.0.1",
                                JSON.toJSONString(mesCombParam),

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

@@ -5,8 +5,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.OutOrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.ReportOrderParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
@@ -310,7 +314,7 @@
                    // 保存接口日志
                    apiLogService.save(
                            "上架派工单完成上报",
                            MesConstant.URL + MesConstant.PAKIN_URL,
                            MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(orderParam),
@@ -385,9 +389,9 @@
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKOUT_URL,
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
                            JSON.toJSONString(orderParam), JSON.toJSONString(response));
                    throw new CoolException("上报mes系统失败");
                    throw new CoolException("上报KOPEN系统失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
@@ -397,7 +401,7 @@
                    // 保存接口日志
                    apiLogService.save(
                            "备货派工单完成上报",
                            MesConstant.URL + MesConstant.PAKOUT_URL,
                            MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(orderParam),
@@ -407,6 +411,88 @@
                    log.error("", e);
                }
            }
        } else if (Integer.valueOf(docType.getDocId() + "").equals(OrderTypeEnum.STOCK.type)) {
            // 备货单反馈
            StockUpOrderParams stockUpOrderParams = new StockUpOrderParams();
            stockUpOrderParams.setCompany_id(order.getCstmrName())
                    .setWms_id(order.getId() + "")
                    .setDispatch_no(order.getNumber());

            OutOrderParams pubOrderParams = new OutOrderParams();
            pubOrderParams.setPick_no(order.getOrderNo())
                    .setOrder_no(order.getShipCode())
                    .setCus_id(order.getCstmrName())
                    .setCus_address(order.getTel());


            List<OrderItemsParam> reportOrderParams = new ArrayList<>();
            orderDetls.forEach(detl -> {
                Mat material = matService.selectByMatnr(detl.getMatnr());
                if (Objects.isNull(material)) {
                    throw new CoolException("物料不存在");
                }
                OrderItemsParam itemParam = new OrderItemsParam();
                // 上报时，默认产品类型是null
                itemParam.setPro_type(material.getProType());
                // 上报时，默认产品编码
                itemParam.setPro_komcode(material.getMatnr());
                // 上报时，默认产品id是供应商编码
                itemParam.setPro_id(detl.getSuppCode());

                // 上报时，默认上报时间是更新时间
                itemParam.setPick_qty(detl.getQty().intValue());
                reportOrderParams.add(itemParam);
            });
            pubOrderParams.setPartList(reportOrderParams);

            List<OutOrderParams> pubOrderParamsList = new ArrayList<>();
            pubOrderParamsList.add(pubOrderParams);
            //设置派工单明细
            stockUpOrderParams.setDetails(pubOrderParamsList);
            stockUpOrderParams.setUpdate_time(order.getUpdateBy$());

            
            XSR response = null;
            boolean success = false;
            try {
                // response = new HttpHandler.Builder()
                // .setUri(MesConstant.URL)
                // .setPath(MesConstant.PAKOUT_URL)
                // .setJson(JSON.toJSONString(pakoutParam))
                // .build()
                // .doPost();
                // JSONObject jsonObject = JSON.parseObject(response);
                // if (jsonObject.getInteger("code").equals(200)) {
                if (true) {
                    success = true;
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), settle, null)) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
                            JSON.toJSONString(stockUpOrderParams), JSON.toJSONString(response));
                    throw new CoolException("上报KOPEN系统失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
                return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "备货单完成上报",
                            MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(stockUpOrderParams),
                            JSON.toJSONString(response),
                            success);
                } catch (Exception e) {
                    log.error("", e);
                }
            }

        }
        return SUCCESS;
    }

 src/main/java/com/zy/common/constant/MesConstant.java

@@ -5,13 +5,15 @@
 */
public class MesConstant {

    public static final String URL = "http://192.168.99.130:80";
    //小系统接口地址
    public static final String URL = "http://webservice.kopen.com.cn:1482/kc-api/api/wms/ ";

    public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";

    public static final String PAKIN_URL = "mes/api/zy/v1/warehouse/sendList";

    public static final String PAKOUT_URL = "wmsFinprd/api/zy/v1/packOut/sendList";
    //上架派工单反馈
    public static final String IN_DISPATCH_RESULT = "getInDispatchResult";
    //备货指示派工单反馈
    public static final String OUT_DISPATCH_RESULT = "getOutDispatchResult";
    //备货订单反馈
    public static final String OUT_DETAILS_RESULT = "getOutDetailsResult";


    /**

 src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -30,7 +30,7 @@
  #  global-config:
  #    field-strategy: 0
  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true

 src/main/webapp/static/js/adjustOrder/adjustOrder.js

@@ -3,7 +3,7 @@
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
    notice: 'notice/notice',
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate','tableMerge','notice'], function () {
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () {
    var $ = layui.jquery;
    var layer = layui.layer;
    var form = layui.form;
@@ -18,21 +18,21 @@

    // 渲染搜索模板
    $.ajax({
        url: baseUrl+"/docType/list/auth",
        headers: {'token': localStorage.getItem('token')},
        url: baseUrl + "/docType/list/auth",
        headers: { 'token': localStorage.getItem('token') },
        data: {
            limit: 9999
        },
        method: 'POST',
        success: function (res) {
            if (res.code === 200){
            if (res.code === 200) {
                let template = Handlebars.compile($('#docTypeTpl').html());
                $('#docType-query').html(template(res.data));
                layui.form.render('select');
            } else if (res.code === 403){
                top.location.href = baseUrl+"/";
            } else if (res.code === 403) {
                top.location.href = baseUrl + "/";
            } else {
                layer.msg(res.msg, {icon: 2})
                layer.msg(res.msg, { icon: 2 })
            }
        }
    })
@@ -40,19 +40,22 @@
    // 渲染表格
    var insTb = table.render({
        elem: '#order',
        url: baseUrl+'/adjustOrder/list/auth',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl + '/adjustOrder/list/auth',
        headers: { token: localStorage.getItem('token') },
        page: true,
        cellMinWidth: 100,
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号'},
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {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',}
            { type: 'numbers' },
            { field: 'orderNo', title: '单据编号' },
            { field: 'docType$', align: 'center', title: '类型', minWidth: 120, width: 120 },
            { field: 'defNumber', align: 'center', title: '流水号', minWidth: 160, width: 160 },
            { field: 'cstmrName', align: 'center', title: '公司', minWidth: 160, width: 160 },
            { field: 'orderTime', title: '订单时间', minWidth: 200, width: 200 },
            { field: 'shipName', align: 'center', title: '调整原因' },
            { field: 'memo', align: 'center', title: '原因描述' },
            { field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl', minWidth: 120, width: 120 },
            { align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160 },
            { align: 'center', title: '操作', toolbar: '#operate', }
        ]],
        request: {
            pageName: 'curr',
@@ -72,7 +75,7 @@
        done: function (res, curr, count) {
            limit();
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
                top.location.href = baseUrl + "/";
            }
            insTbCount = count;
        }
@@ -80,7 +83,7 @@

    // 搜索
    form.on('submit(tbSearch)', function (data) {
        insTb.reload({where: data.field, page: {curr: 1}});
        insTb.reload({ where: data.field, page: { curr: 1 } });
    });

    // 添加
@@ -94,11 +97,11 @@
        var layEvent = obj.event;
        if (layEvent === 'edit') {
            showEditModel(data);
        }else if (layEvent === 'adjust') {
        } else if (layEvent === 'adjust') {
            adjustComplete(data.id);
        }else if (layEvent === 'export') {
        } else if (layEvent === 'export') {
            export1(data.id);
        }else if (layEvent === 'del') {
        } else if (layEvent === 'del') {
            doDel(data.id);
        } else if (layEvent === 'complete') {
            doModify(data.id, data.orderNo, 4);
@@ -125,15 +128,17 @@
                        height: '450px;',
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'locNo', title: '库位号', width: 120},
                            {field: 'zpallet', title: '容器码', width: 120},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '批号'},
                            {field: 'diffQty', title: '差异数量', style: 'font-weight: bold'},
                            {field: 'specs', title: '规格'},
                            {field: 'status$', title: '状态'}
                            { type: 'numbers' },
                            { field: 'locNo', title: '库位号', width: 120 },
                            { field: 'zpallet', title: '容器码', width: 120 },
                            { field: 'matnr', title: '商品编码', width: 160 },
                            { field: 'maktx', title: '商品名称', width: 160 },
                            { field: 'suppCode', title: '供应商编码' },
                            { field: 'length', align: 'center', title: '重量', hide: false }
                            ,{ field: 'volume', align: 'center', title: '尺寸', hide: false }
                            ,{ field: 'diffQty', title: '差异数量', style: 'font-weight: bold' },
                            { field: 'specs', title: '规格' },
                            { field: 'status$', title: '状态' }
                        ]],
                        request: {
                            pageName: 'curr',
@@ -179,58 +184,58 @@
                form.on('submit(orderEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        layer.tips('请添加单据明细', '#matAddBtnComment', { tips: [1, '#ff4c4c'] });
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    layer.load(2);
                    if (isExpAdd){
                    if (isExpAdd) {
                        $.ajax({
                            url: baseUrl+"/checkOrder/form/" + "add" + "/auth",
                            headers: {'token': localStorage.getItem('token')},
                            url: baseUrl + "/checkOrder/form/" + "add" + "/auth",
                            headers: { 'token': localStorage.getItem('token') },
                            data: JSON.stringify({
                                orderId: Number(data.field.id),
                                docType: Number(data.field.docType),
                                orderNo: data.field.orderNo,
                                locDetlList: nList
                            }),
                            contentType:'application/json;charset=UTF-8',
                            contentType: 'application/json;charset=UTF-8',
                            method: 'POST',
                            success: function (res) {
                                layer.closeAll('loading');
                                if (res.code === 200){
                                if (res.code === 200) {
                                    layer.close(dIndex);
                                    $(".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});
                                    layer.msg(res.msg, { icon: 1 });
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl + "/";
                                } else {
                                    layer.msg(res.msg, { icon: 2 });
                                }
                            }
                        })
                    }else {
                    } else {
                        $.ajax({
                            url: baseUrl+"/checkOrder/form/" + "modify" + "/auth",
                            headers: {'token': localStorage.getItem('token')},
                            url: baseUrl + "/checkOrder/form/" + "modify" + "/auth",
                            headers: { 'token': localStorage.getItem('token') },
                            data: JSON.stringify({
                                orderId: Number(data.field.id),
                                docType: Number(data.field.docType),
                                orderNo: data.field.orderNo,
                                checkOrderDetls: nList
                            }),
                            contentType:'application/json;charset=UTF-8',
                            contentType: 'application/json;charset=UTF-8',
                            method: 'POST',
                            success: function (res) {
                                layer.closeAll('loading');
                                if (res.code === 200){
                                if (res.code === 200) {
                                    layer.close(dIndex);
                                    $(".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});
                                    layer.msg(res.msg, { icon: 1 });
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl + "/";
                                } else {
                                    layer.msg(res.msg, { icon: 2 });
                                }
                            }
                        })
@@ -242,21 +247,21 @@
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    headers: {token: localStorage.getItem('token')},
                    headers: { token: localStorage.getItem('token') },
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'locNo', title: '库位号'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'batch', title: '批号'},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量', minWidth: 110, width: 110},
                        { type: 'numbers', title: '#' },
                        { field: 'locNo', title: '库位号' },
                        { field: 'matnr', title: '商品编码', width: 160 },
                        { field: 'maktx', title: '商品名称', width: 200 },
                        { field: 'batch', title: '批号' },
                        { field: 'specs', title: '规格' },
                        { field: 'anfme', title: '数量', minWidth: 110, width: 110 },
                        // {field: 'unit', title: '单位', width: 80},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                        { align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right' }
                    ]],
                    done: function (res) {
                        $(layero).find('.layui-table-view').css('margin', '0');
@@ -265,18 +270,18 @@
                };
                if (!isExpAdd) {
                    $.ajax({
                        url: baseUrl+"/checkOrderDetl/select/all?orderId=" + expTpe.id,
                        headers: {'token': localStorage.getItem('token')},
                        url: baseUrl + "/checkOrderDetl/select/all?orderId=" + expTpe.id,
                        headers: { 'token': localStorage.getItem('token') },
                        method: 'GET',
                        async: false,
                        success: function (res) {
                            if (res.code === 200){
                            if (res.code === 200) {
                                xxDataList = res.data;
                                tbOptions.data = xxDataList;
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2})
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg, { icon: 2 })
                            }
                        }
                    })
@@ -287,8 +292,8 @@
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'del') {
                        if(data.workQty > 0){
                            layer.msg("已存在作业数量，不能删除", {icon: 2});
                        if (data.workQty > 0) {
                            layer.msg("已存在作业数量，不能删除", { icon: 2 });
                            return;
                        }
                        layer.confirm('确定要删除吗？', {
@@ -302,13 +307,13 @@
                                    break;
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                            insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
                        });
                    }
                });

                // 全局函数，用于接收从库存查询页面返回的数据
                window.addCheckOrderTableData = function(data) {
                window.addCheckOrderTableData = function (data) {
                    // 处理选中的库存数据
                    var addedCount = 0;
                    var duplicateCount = 0;
@@ -317,7 +322,7 @@
                        var isDuplicate = false;
                        for (var j = 0; j < xxDataList.length; j++) {
                            if (xxDataList[j].locNo === data[i].locNo && xxDataList[j].matnr === data[i].matnr && xxDataList[j].batch === data[i].batch) {
                                if (xxDataList[j].diffQty !== 0){
                                if (xxDataList[j].diffQty !== 0) {
                                    isDuplicate = true;
                                    duplicateCount++;
                                    break;
@@ -325,22 +330,22 @@

                            }
                        }
                        if (data[j].diffQty !== 0){
                        if (data[j].diffQty !== 0) {
                            isDuplicate = true;
                            duplicateCount++;
                        }
                        // 如果不重复，则添加到列表
                        if (!isDuplicate) {
                            xxDataList.push({...data[i]});
                            xxDataList.push({ ...data[i] });
                            addedCount++;
                        }
                    }
                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                    insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
                    // 提示添加结果
                    if (duplicateCount > 0) {
                        layer.msg('成功添加 ' + addedCount + ' 条数据，' + duplicateCount + ' 条数据已忽略', {icon: 1});
                        layer.msg('成功添加 ' + addedCount + ' 条数据，' + duplicateCount + ' 条数据已忽略', { icon: 1 });
                    } else if (addedCount > 0) {
                        layer.msg('成功添加 ' + addedCount + ' 条数据', {icon: 1});
                        layer.msg('成功添加 ' + addedCount + ' 条数据', { icon: 1 });
                    }
                };

@@ -350,7 +355,7 @@

                // 显示添加明细表单弹窗 - 提取库存
                function showEditModel2(exp) {
                    let loadIndex = layer.msg('请求中...', {icon: 16, shade: 0.01, time: false});
                    let loadIndex = layer.msg('请求中...', { icon: 16, shade: 0.01, time: false });
                    layer.open({
                        type: 2,
                        title: '提取库存',
@@ -359,7 +364,7 @@
                        area: ['90%', '85%'],
                        shadeClose: true,
                        content: 'checkOrderLocQuery.html',
                        success: function(layero, index){
                        success: function (layero, index) {
                            layer.close(loadIndex);
                        }
                    });
@@ -378,25 +383,25 @@
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/checkOrder/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                url: baseUrl + "/checkOrder/delete/auth",
                headers: { 'token': localStorage.getItem('token') },
                data: {
                    orderId: orderId
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                    if (res.code === 200) {
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                            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});
                        layer.msg(res.msg, { icon: 1 });
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg, { icon: 2 });
                    }
                }
            })
@@ -412,25 +417,25 @@
            layer.close(i);
            layer.load(2);
            $.ajax({
                url: baseUrl+"/checkOrder/complete/auth",
                headers: {'token': localStorage.getItem('token')},
                url: baseUrl + "/checkOrder/complete/auth",
                headers: { 'token': localStorage.getItem('token') },
                data: {
                    orderId: orderId
                },
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                    if (res.code === 200) {
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                            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});
                        layer.msg(res.msg, { icon: 1 });
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg, { icon: 2 });
                    }
                }
            })
@@ -442,31 +447,31 @@
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl + "/adjustOrder/complete/auth",
            headers: {'token': localStorage.getItem('token')},
            headers: { 'token': localStorage.getItem('token') },
            data: {
                orderId: id
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                if (res.code === 200) {
                    layer.close(loadIndex);
                    layer.msg(res.msg, {icon: 1});
                    insTb.reload({where: null});
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                    layer.msg(res.msg, { icon: 1 });
                    insTb.reload({ where: null });
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/";
                } else {
                    layer.close(loadIndex);
                    layer.msg(res.msg, {icon: 2})
                    layer.msg(res.msg, { icon: 2 })
                }
            }
        })
    }

    function export1(id) {
        notice.msg('正在导出文件......', {icon: 4});
        notice.msg('正在导出文件......', { icon: 4 });
        $.ajax({
            url: baseUrl + "/checkOrder/export/auth",
            headers: {'token': localStorage.getItem('token')},
            headers: { 'token': localStorage.getItem('token') },
            data: {
                orderId: id
            },
@@ -486,9 +491,9 @@
                        filename = decodeURIComponent(matches[1].replace(/['"]/g, ''));
                    }
                }
                

                // 创建下载链接
                var blob = new Blob([data], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
                var blob = new Blob([data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
                var link = document.createElement('a');
                link.href = window.URL.createObjectURL(blob);
                link.download = filename;
@@ -496,15 +501,15 @@
                link.click();
                document.body.removeChild(link);
                window.URL.revokeObjectURL(link.href);
                
                layer.msg('导出成功', {icon: 1});

                layer.msg('导出成功', { icon: 1 });
            },
            error: function (xhr, status, error) {
                notice.destroy();
                if (xhr.status === 403) {
                    top.location.href = baseUrl + "/";
                } else {
                    layer.msg('导出失败：' + error, {icon: 2});
                    layer.msg('导出失败：' + error, { icon: 2 });
                }
            }
        });
@@ -512,10 +517,10 @@

    function pakout(tableCache, layerIndex) {
        // let loadIndex = layer.load(2);
        notice.msg('正在生成盘点出库任务......', {icon: 4});
        notice.msg('正在生成盘点出库任务......', { icon: 4 });
        $.ajax({
            url: baseUrl + "/out/checkPakOut/auth",
            headers: {'token': localStorage.getItem('token')},
            headers: { 'token': localStorage.getItem('token') },
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(tableCache),
            method: 'POST',
@@ -523,12 +528,12 @@
                notice.destroy();
                if (res.code === 200) {
                    layer.close(layerIndex);
                    layer.msg(res.msg, {icon: 1});
                    insTb.reload({where: null});
                    layer.msg(res.msg, { icon: 1 });
                    insTb.reload({ where: null });
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/";
                } else {
                    layer.msg(res.msg, {icon: 2})
                    layer.msg(res.msg, { icon: 2 })
                }
            }
        });
@@ -536,7 +541,7 @@

    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
        , type: 'datetime'
        , range: true
    });
});