Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-11-25 b4fccc0d704362a1747cc90d6e8c60414ad1a1f6

Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js

@@ -71,9 +71,8 @@
                        // å‘起撤销组盘请求
                        try {
                            //console.log('发起撤销组盘请求，托盘号：', formData.palletCode.trim());
                            const response = await http.post('/api/InboundOrder/CancelPalletGroup', {
                                palletCode: formData.palletCode.trim()
                            });
                            const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim());
                              

                            const { status, message, data } = response;
                            if (status) {

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue

@@ -111,6 +111,12 @@
          width: 90,
        },
        {
          prop: "currentBarcode",
          title: "条码",
          type: "string",
          width: 90,
        },
        {
          prop: "batchNo",
          title: "批次号",
          type: "string",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue

@@ -44,9 +44,9 @@
    });
    const searchFormOptions = ref([
      [
        { title: "货位号", field: "locationCode" },
        { title: "单据编号", field: "orderNo" },
        { title: "任务号", field: "taskNum" },
        { title: "货位号", field: "locationCode" ,type:"like"},
        { title: "单据编号", field: "orderNo",type:"like"},
        { title: "任务号", field: "taskNum" ,type:"like"},
      ],
      [
        {

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue

@@ -39,15 +39,15 @@
      });
      const searchFormOptions = ref([
        [
          { title: "托盘号", field: "palleCode" },
          { title: "物料编号", field: "materielCode" },
          { title: "单据编号", field: "orderNo" },
          { title: "托盘号", field: "palleCode" ,type:"like"},
          { title: "物料编号", field: "materielCode",type:"like" },
          { title: "单据编号", field: "orderNo" ,type:"like"},
          { title: "变动类型", field: "changeType" ,type: "selectList",dataKey: "stockChangeType",data: [],},
        ],
        [
          { title: "批次号", field: "batchNo" },
          { title: "任务号", field: "taskNum" },
          { title: "序列号", field: "serilNumber" },
          { title: "批次号", field: "batchNo" ,type:"like"},
          { title: "任务号", field: "taskNum" ,type:"like"},
          { title: "序列号", field: "serilNumber" ,type:"like"},
        ],
      ]);
      const columns = ref([
@@ -90,6 +90,13 @@
          align: "left",
        },
        {
          field: "barcode",
          title: "条码",
          type: "string",
          width: 150,
          align: "left",
        },
        {
          field: "batchNo",
          title: "批次号",
          type: "string",

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -652,20 +652,26 @@
            {
                return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
            }

            if(stock.Details == null || !stock.Details.Any())
            {
                _stockRepository.DeleteData(stock);
                return WebResponseContent.Instance.OK();
            }
            //  èŽ·å–库存详情关联的所有入库单号
            var relatedOrderNos = stock.Details.Select(d => d.OrderNo).First();
            //  æŸ¥è¯¢æ‰€æœ‰å…³è”的入库单（含详情）
            var inboundOrders = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
                .Includes(x => x.Details) 
                .Where(x => relatedOrderNos==x.InboundOrderNo)
                .Includes(x => x.Details)
                .Where(x => relatedOrderNos == x.InboundOrderNo)
                .First();

            var barcodes = stock.Details.Select(d => d.Barcode).ToList();

                // åŒ¹é…åº“存条码对应的入库单明细
                var matchedInboundDetails = inboundOrders.Details
                    ?.Where(d => barcodes.Contains(d.Barcode))
                    .ToList();
            // åŒ¹é…åº“存条码对应的入库单明细
            var matchedInboundDetails = inboundOrders.Details
                ?.Where(d => barcodes.Contains(d.Barcode))
                .ToList();
            foreach (var detail in matchedInboundDetails)
            {
                detail.ReceiptQuantity = 0;
@@ -675,7 +681,8 @@
            _stockDetailRepository.DeleteData(stock.Details);
            _stockRepository.DeleteData(stock);

            return WebResponseContent.Instance.OK();

            return WebResponseContent.Instance.OK("托盘撤销成功");
        }
    }
}