提交

heshaofeng

2025-12-08 0ea40a1592de878592b2872b9c3005014233a136

提交

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

@@ -54,7 +54,8 @@

                    // å“åº”式表单数据：托盘号（必填）
                    const formData = reactive({
                        palletCode: '' // æ‰˜ç›˜å·è¾“入框
                        palletCode: '', // æ‰˜ç›˜å·è¾“入框
                        barcode:''
                    });

                    // æäº¤è¡¨å•çš„统一逻辑
@@ -71,7 +72,7 @@
                        // å‘起撤销组盘请求
                        try {
                            //console.log('发起撤销组盘请求，托盘号：', formData.palletCode.trim());
                            const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim());
                            const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim()+'&barcode='+formData.barcode.trim());
                              

                            const { status, message, data } = response;
@@ -155,6 +156,23 @@
                                    }
                                })
                            ]),
                            h(ElFormItem,{label: '条码', prop: 'barcode'},[
                              h(ElInput, {
                                type: 'text',
                                modelValue: formData.barcode,
                                'onUpdate:modelValue': (val) => {
                                    formData.barcode = val;
                                },
                                placeholder: '可选，扫码输入或手动输入条码',
                                maxLength: 50,
                                onKeydown: (e) => {
                                    if (e.key === 'Enter') {
                                        e.preventDefault();
                                        submitForm();
                                    }
                                  }
                              })
                            ]),
                            // åº•éƒ¨æŒ‰é’®åŒº
                            h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
                                h(ElButton, {

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

@@ -55,7 +55,8 @@

          // å“åº”式表单数据：托盘号（必填）
          const formData = reactive({
            palletCode: '' // æ‰˜ç›˜å·è¾“入框
                        palletCode: '', // æ‰˜ç›˜å·è¾“入框
                        barcode:''
          });

          // æäº¤è¡¨å•çš„统一逻辑
@@ -72,12 +73,13 @@
            // å‘起撤销组盘请求
            try {
              //console.log('发起撤销组盘请求，托盘号：', formData.palletCode.trim());
              const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode=' + formData.palletCode.trim());
                            const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim()+'&barcode='+formData.barcode.trim());


              const { status, message, data } = response;
              if (status) {
                ElMessage.success(`撤销组盘成功，托盘号：${formData.palletCode.trim()}`);
                                ElMessage.success(response.message);
                                console.log(response.message)
                this.refresh(); // æˆåŠŸåŽåˆ·æ–°åˆ—表
                // å…³é—­å¯¹è¯æ¡†
                render(null, mountNode);
@@ -156,6 +158,23 @@
                  }
                })
              ]),
                            h(ElFormItem,{label: '条码', prop: 'barcode'},[
                              h(ElInput, {
                                type: 'text',
                                modelValue: formData.barcode,
                                'onUpdate:modelValue': (val) => {
                                    formData.barcode = val;
                                },
                                placeholder: '可选，扫码输入或手动输入条码',
                                maxLength: 50,
                                onKeydown: (e) => {
                                    if (e.key === 'Enter') {
                                        e.preventDefault();
                                        submitForm();
                                    }
                                  }
                              })
                            ]),
              // åº•éƒ¨æŒ‰é’®åŒº
              h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
                h(ElButton, {

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue

@@ -60,6 +60,7 @@
      materielCode: "",
      materielName: "",
      orderNo: "",
      palletCode:""
    });
    const searchFormOptions = ref([
      [

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

@@ -24,6 +24,6 @@

        WebResponseContent UnPalletQuantity(string orderNo);

        WebResponseContent UndoPalletGroup(string palletCode);
        WebResponseContent UndoPalletGroup(string palletCode , string barcode = "");
    }
}

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

@@ -646,48 +646,125 @@
            }
        }

        public WebResponseContent UndoPalletGroup(string palletCode)
        public WebResponseContent UndoPalletGroup(string palletCode, string barcode = "")
        {
            
            if (string.IsNullOrWhiteSpace(palletCode))
            {
                return WebResponseContent.Instance.Error("托盘号不能为空");
            }
            var stock = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o => o.Details).First(x => x.PalletCode == palletCode && (x.StockStatus == (int)StockStatusEmun.组盘暂存|| x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

            
            try
            {
                _unitOfWorkManage.BeginTran(); 

                // 2. æŸ¥è¯¢æ‰˜ç›˜åº“存主记录（避免无数据抛异常）
                var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(o => o.Details)
                    .First(x => x.PalletCode == palletCode
                                         && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                                             || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

            if (stock == null)
            {
                return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
            }

                // 3. åœºæ™¯1：删除指定条码
                if (!string.IsNullOrWhiteSpace(barcode))
                {
                    var targetDetail = stock.Details?.FirstOrDefault(x => x.Barcode == barcode);
                    if (targetDetail == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"托盘{palletCode}下未找到条码{barcode}的明细记录");
                    }

                    // åˆ é™¤æŒ‡å®šæ˜Žç»†
                    _stockDetailRepository.DeleteData(targetDetail);

                    // é‡æ–°æŸ¥è¯¢å‰©ä½™æ˜Žç»†ï¼ˆä¿è¯æ•°æ®å‡†ç¡®æ€§ï¼‰
                    var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
                        .Where(x => x.StockId == stock.Id)
                        .ToList();

                    // å‰©ä½™æ˜Žç»†ä¸ºç©º â†’ åˆ é™¤ä¸»è¡¨ + é‡ç½®å…¥åº“单及明细状态
                    if (!remainingDetails.Any())
                    {
                        // é‡ç½®å…¥åº“单及明细状态
                        ResetInboundOrderStatus(stock.Details.Select(d => d.OrderNo).Distinct().ToList());

                        _stockRepository.DeleteData(stock);
                        _unitOfWorkManage.CommitTran();
                        return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘无剩余明细，已删除托盘并重置关联入库单状态");
                    }

                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘仍有剩余明细");
                }

                // åˆ é™¤æ•´æ‰˜ç›˜ï¼ˆæ— æ¡ç ä¼ å…¥ï¼‰
            if (stock.Details == null || !stock.Details.Any())
            {
                _stockRepository.DeleteData(stock);
                return WebResponseContent.Instance.OK();
                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK("托盘无明细记录，已直接删除托盘主数据");
            }
            //  èŽ·å–库存详情关联的所有入库单号
            var relatedOrderNos = stock.Details.Select(d => d.OrderNo).First();
            //  æŸ¥è¯¢æ‰€æœ‰å…³è”的入库单（含详情）
            var inboundOrders = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()

                // æœ‰æ˜Žç»† â†’ é‡ç½®å…¥åº“单及明细状态 + åˆ é™¤åº“å­˜
                var relatedOrderNos = stock.Details.Select(d => d.OrderNo).Distinct().ToList();
                if (!relatedOrderNos.Any())
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error("库存明细未关联任何入库单号，无法完成撤销");
                }

                // é‡ç½®å…¥åº“单主状态 + æ˜Žç»†çŠ¶æ€
                ResetInboundOrderStatus(relatedOrderNos, stock.Details.Select(d => d.Barcode).ToList());

                // 4.3 åˆ é™¤åº“存明细和主表
                _stockDetailRepository.DeleteData(stock.Details);
                _stockRepository.DeleteData(stock);

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("托盘撤销成功，已重置关联入库单及明细状态");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran(); 
                return WebResponseContent.Instance.Error($"托盘撤销失败：{ex.Message}");
            }
        }


        private void ResetInboundOrderStatus(List<string> orderNos, List<string> barcodes = null)
        {
            foreach (var orderNo in orderNos)
            {
                var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
                .Includes(x => x.Details)
                .Where(x => relatedOrderNos == x.InboundOrderNo)
                .First();
                    .First(x => x.InboundOrderNo == orderNo);

            var barcodes = stock.Details.Select(d => d.Barcode).ToList();
                if (inboundOrder == null) continue;

            // åŒ¹é…åº“存条码对应的入库单明细
            var matchedInboundDetails = inboundOrders.Details
                ?.Where(d => barcodes.Contains(d.Barcode))
                .ToList();
            foreach (var detail in matchedInboundDetails)
                inboundOrder.OrderStatus = 0;
                _inboundOrderRepository.UpdateData(inboundOrder);

                // é‡ç½®å…¥åº“单明细状态
                if (inboundOrder.Details == null || !inboundOrder.Details.Any()) continue;

                var targetDetails = barcodes == null
                    ? inboundOrder.Details.ToList() // ä¸ä¼ æ¡ç åˆ™é‡ç½®æ•´å•æ˜Žç»†
                    : inboundOrder.Details.Where(d => barcodes.Contains(d.Barcode)).ToList();

                foreach (var detail in targetDetails)
            {
                detail.ReceiptQuantity = 0;
                detail.OrderDetailStatus = 0;
                _inboundOrderDetailRepository.UpdateData(detail);
            }
            _stockDetailRepository.DeleteData(stock.Details);
            _stockRepository.DeleteData(stock);


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

        public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)

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

@@ -215,9 +215,9 @@
        }

        [HttpPost, Route("UndoPalletGroup"), AllowAnonymous, MethodParamsValidate]
        public WebResponseContent UndoPalletGroup(string palletCode)
        public WebResponseContent UndoPalletGroup(string palletCode,string barcode="")
        {
            return Service.UndoPalletGroup(palletCode);
            return Service.UndoPalletGroup(palletCode,barcode);
        }
        /// <summary>
        ///