#

zhou zhou

2025-11-19 887dbc46b49b57eedd03d2daeaa6c3f57c540f3f

#

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

@@ -112,6 +112,7 @@
        for (LocDetl locDetl : param.getLocDetlList()) {
            CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
            checkOrderDetl.sync(locDetl);
            checkOrderDetl.setLocDetlId(locDetl.getId());
            checkOrderDetl.setOrderId(checkOrder.getId());
            checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
            checkOrderDetl.setMatnr(locDetl.getMatnr());
@@ -157,6 +158,7 @@
        for (CheckOrderDetl checkOrderDetl : param.getCheckOrderDetls()) {
            CheckOrderDetl checkOrderDetl1 = new CheckOrderDetl();
            checkOrderDetl1.sync(checkOrderDetl);
            checkOrderDetl1.setLocDetlId(checkOrderDetl.getLocDetlId()==null?checkOrderDetl.getId():checkOrderDetl.getLocDetlId());
            checkOrderDetl1.setOrderId(checkOrder.getId());
            checkOrderDetl1.setOrderNo(checkOrder.getOrderNo());
            checkOrderDetl1.setMatnr(checkOrderDetl.getMatnr());
@@ -167,7 +169,7 @@
            checkOrderDetl1.setQty(checkOrderDetl.getQty());
            checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
            checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
            checkOrderDetl.setZpallet(checkOrderDetl.getZpallet());
            checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
            if (!checkOrderDetlService.insert(checkOrderDetl1)) {
                throw new CoolException("保存盘点单明细失败");
            }

 src/main/java/com/zy/asrs/entity/CheckOrderDetl.java

@@ -50,6 +50,10 @@
    @TableField("order_id")
    private Long orderId;

    @ApiModelProperty(value= "库存明细id")
    @TableField("loc_detl_id")
    private Long locDetlId;

    /**
     * 单据编号
     */

 src/main/webapp/static/js/checkOrder/checkOrder.js

@@ -319,22 +319,31 @@
                // 全局函数，用于接收从库存查询页面返回的数据
                window.addCheckOrderTableData = function(data) {
                    // 处理选中的库存数据
                    var addedCount = 0;
                    var duplicateCount = 0;
                    for (var i = 0; i < data.length; i++) {
                            // 添加新的明细数据
                            // xxDataList.push({
                            //     id: data[i].id || (Date.now() + '_' + i),
                            //     locNo: data[i].locNo,
                            //     matnr: data[i].matnr,
                            //     maktx: data[i].maktx,
                            //     batch: data[i].batch,
                            //     specs: data[i].specs,
                            //     anfme: data[i].anfme || 0,
                            //     workQty: 0,
                            //     memo: ''
                            // });
                            xxDataList.push({...data[i]})
                        // 判断是否已存在相同的商品编码和批号
                        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) {
                                isDuplicate = true;
                                duplicateCount++;
                                break;
                            }
                        }
                        // 如果不重复，则添加到列表
                        if (!isDuplicate) {
                            xxDataList.push({...data[i]});
                            addedCount++;
                        }
                    }
                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                    // 提示添加结果
                    if (duplicateCount > 0) {
                        layer.msg('成功添加 ' + addedCount + ' 条数据，' + duplicateCount + ' 条重复数据已忽略', {icon: 1});
                    } else if (addedCount > 0) {
                        layer.msg('成功添加 ' + addedCount + ' 条数据', {icon: 1});
                    }
                };

                $('#matAddBtnComment').click(function () {