222

schangxiang@126.com

2024-12-14 de11618a6c41d627acd733a6b5d818d87d291c1e

222

 CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs

@@ -976,6 +976,9 @@
        private bool R_OutboundFinishField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private bool R_OutboundModeField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string R_OutboundNumberField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1174,6 +1177,19 @@
        }
        
        [System.Runtime.Serialization.DataMemberAttribute()]
        public bool R_OutboundMode {
            get {
                return this.R_OutboundModeField;
            }
            set {
                if ((this.R_OutboundModeField.Equals(value) != true)) {
                    this.R_OutboundModeField = value;
                    this.RaisePropertyChanged("R_OutboundMode");
                }
            }
        }
        
        [System.Runtime.Serialization.DataMemberAttribute()]
        public string R_OutboundNumber {
            get {
                return this.R_OutboundNumberField;

 CC/iWareCC_ASRS/Connected Services/StationService/item4.xsd

@@ -89,6 +89,7 @@
      <xs:element minOccurs="0" name="R_Inbound_TaskID" type="xs:short" />
      <xs:element minOccurs="0" name="R_Model" type="xs:short" />
      <xs:element minOccurs="0" name="R_OutboundFinish" type="xs:boolean" />
      <xs:element minOccurs="0" name="R_OutboundMode" type="xs:boolean" />
      <xs:element minOccurs="0" name="R_OutboundNumber" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="R_Outbound_TaskID" type="xs:short" />
      <xs:element minOccurs="0" name="R_PalletizingAck" type="xs:boolean" />

 CC/iWareModel/EnumType/WMS/StockStatusEnum.cs

@@ -37,7 +37,13 @@
        /// äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º
        /// </summary>
        [Description("人工强制任务已创建")]
        äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º = 5
        äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º = 5,

        /// <summary>
        /// äººå·¥é½åŒ…出库任务已创建
        /// </summary>
        [Description("人工齐包出库任务已创建")]
        äººå·¥é½åŒ…出库任务已创建 = 6
    }

    /// <summary>

 LA24030_LuLiPackageLine_Pda/manifest.json

@@ -1,8 +1,8 @@
{
    "name" : "LuLiMuYe_Package_Pda",
    "appid" : "__UNI__28D87EB",
    "description" : "2024.12.12",
    "versionName" : "1.0.3",
    "description" : "2024.12.14",
    "versionName" : "1.0.4",
    "versionCode" : "100",
    "transformPx" : false,
    "app-plus" : {

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue

@@ -87,6 +87,7 @@
                                <el-button type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-Refresh" @click="() => (queryParams = {})"> é‡ç½® </el-button>

                                <el-button icon="ele-Finished" @click="clickOutForQiBao"> é½åŒ…出库 </el-button>
                                <el-button icon="ele-Finished" @click="clickOut"> å¼ºåˆ¶å‡ºåº“ </el-button>

                                <!-- <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left: 5px"> é«˜çº§æŸ¥è¯¢ </el-button>
@@ -103,7 +104,12 @@
                <div class="left-table">
                    <p class="text-xtiny">齐包列表</p>

                    <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" ref="tableRef" row-key="id" @sort-change="sortChange" :summary-method="getExportTitle" border="">
                    <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" 
                    ref="tableRef" row-key="id"
                    @selection-change="handleSelectionChangeForQiBao"
                     @sort-change="sortChange"
                     :summary-method="getExportTitle" border="">
                     <el-table-column align="center" width="60" type="selection" />
                        <el-table-column type="index" label="序号" width="55" align="center" />
                        <!-- <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" /> -->
                        <el-table-column label="包装号" prop="packageCode" width="150" align="left" show-overflow-tooltip>
@@ -205,6 +211,7 @@
    downloadExcelTemplateWmsOrderPurchaseAll,
    packList,
    ForceOutbound,
    PersonOutbound
} from '/@/api/main/WmsOrder/wmsOrderPurchase';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
import { getAPI } from '/@/utils/axios-utils';
@@ -466,6 +473,14 @@
};

//选中的行
const checkRowsForQiBao = ref<{ id: number }[]>([]);

// é€‰æ‹©
const handleSelectionChangeForQiBao = (val: any) => {
    checkRowsForQiBao.value = val;
};

//选中的行
const checkRows = ref<{ id: number }[]>([]);

// é€‰æ‹©
@@ -473,6 +488,30 @@
    checkRows.value = val;
};

const clickOutForQiBao = () => {
    var PackageCodeList = checkRowsForQiBao.value.map((x: any) => x.packageCode);
    if (PackageCodeList.length == 0) {
        ElMessage.error('请选择需要齐包出库的订单！');
        return;
    }
    ElMessageBox.confirm('是否确认齐包出库？', '提示', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
    })
        .then(async () => {
            loading.value = true;
            var res = await PersonOutbound(
                {
                    "PackageCodeList": PackageCodeList
                }
            );
            handleQuery();
            ElMessage.success('齐包出库请求成功');
            loading.value = false;
        })
        .catch(() => ElMessage.info('已取消'));
};
const clickOut = () => {
    var PackageCodeList = checkRows.value.map((x: any) => x.packageCode);
    if (PackageCodeList.length == 0) {
@@ -492,7 +531,7 @@
                }
            );
            handleQuery();
            ElMessage.success('强制出库成功');
            ElMessage.success('强制出库请求成功');
            loading.value = false;
        })
        .catch(() => ElMessage.info('已取消'));

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/StockStatusEnum.cs

@@ -34,7 +34,13 @@
    /// äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º
    /// </summary>
    [Description("人工强制任务已创建")]
    äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º = 5
    äººå·¥å¼ºåˆ¶ä»»åŠ¡å·²åˆ›å»º = 5,

    /// <summary>
    /// äººå·¥é½åŒ…出库任务已创建
    /// </summary>
    [Description("人工齐包出库任务已创建")]
    äººå·¥é½åŒ…出库任务已创建 = 6


}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/WmsCommonnQueryInput.cs

@@ -7,43 +7,16 @@
namespace Admin.NET.Application.Service.WmsCommonnQuery.Dto;

/// <summary>
/// åº“存信息分页查询输入参数
/// ç¼“存岛齐包查询输入参数
/// </summary>
public class PackListInput : BasePageInput
public class PackListInput
{
    /// <summary>
    /// å…³é”®å­—查询
    /// </summary>
    public string? SearchKey { get; set; }

    /// <summary>
    /// æ˜¯å¦é½å¥—
    /// æ˜¯å¦é½åŒ…
    /// </summary>
    public bool? IsPack { get; set; }

    /// <summary>
    /// è¿›å…¥æ—¶é—´
    /// </summary>
    public DateTime? InTime { get; set; }

    /// <summary>
    /// è¿›å…¥æ—¶é—´èŒƒå›´
    /// </summary>
    public List<DateTime?> InTimeRange { get; set; }
    /// <summary>
    /// éƒ¨ä»¶æ¡ç 
    /// </summary>
    public string? Upi { get; set; }

    /// <summary>
    /// éƒ¨ä»¶åç§°
    /// </summary>
    public string? DetailName { get; set; }

    /// <summary>
    /// æ‰¹æ¬¡
    /// </summary>
    public string? PlanNo { get; set; }
    public string PackageCode { get; set; }

}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/PersonOutboundInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
using Admin.NET.Core;
using System.ComponentModel.DataAnnotations;

namespace Admin.NET.Application;

/// <summary>
/// äººå·¥é½åŒ…出库输入参数
/// </summary>
public class PersonOutboundInput
{

    /// <summary>
    /// åŒ…装号集合
    /// </summary>
    public virtual List<string> PackageCodeList { get; set; }

}



 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs

@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Furion.DatabaseAccessor;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;

namespace Admin.NET.Application;
/// <summary>
@@ -26,6 +27,7 @@
    private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
    private readonly SqlSugarRepository<Mes_Upi_LineQueue> _mes_Upi_LineQueueRep;
    private readonly SqlSugarRepository<WmsRecordUpiNg> _wmsRecordUpiNgRep;
    private readonly WmsCommonnQueryService _wmsCommonnQueryService;

    public WmsOperationTaskService(
        SqlSugarRepository<Mes_Upi_LineQueue> mes_Upi_LineQueueRep,
@@ -37,8 +39,10 @@
        , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
        , SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
        , SqlSugarRepository<WmsRecordUpiNg> wmsRecordUpiNgRep
        , WmsCommonnQueryService wmsCommonnQueryService
        )
    {
        _wmsCommonnQueryService = wmsCommonnQueryService;
        _wmsRecordUpiNgRep = wmsRecordUpiNgRep;
        _sysConfigRep = sysConfigRep;
        _mesPackageGatherRep = mesPackageGatherRep;
@@ -68,14 +72,23 @@
        {
            throw Oops.Oh("参数不能为空");
        }
        //验证传递的包是否都在齐包之内。
        List<WmsPackListOutput> packList = await _wmsCommonnQueryService.PackList(new Service.WmsCommonnQuery.Dto.PackListInput() { IsPack = false });

        List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
        foreach (var item in input.PackageCodeList)
        {
            var isExistCount = packList.Where(x => x.PackageCode == item).Count();
            if (isExistCount == 0)
            {
                throw Oops.Oh($"包{item}不是缺包状态，请检查！");
            }

            var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
            var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.齐包待出库).Count();
            var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.齐包待出库 || x.StockStatus == StockStatusEnum.人工齐包出库任务已创建).Count();
            if (isExist > 0)
            {
                throw Oops.Oh($"包{item}中其中有板状态是'{StockStatusEnum.齐包待出库.ToString()}'，不允许强制出库");
                throw Oops.Oh($"包{item}中其中有板状态是'{StockStatusEnum.齐包待出库.ToString()}' æˆ–'{StockStatusEnum.人工齐包出库任务已创建.ToString()}'，不允许强制出库");
            }

            //更新状态 
@@ -93,6 +106,56 @@

    }


    /// <summary>
    /// äººå·¥é½åŒ…出库
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "PersonOutbound")]
    [Description("WmsOperationTask/PersonOutbound")]
    [UnitOfWork]
    public async Task PersonOutbound(PersonOutboundInput input)
    {
        if (input == null || input.PackageCodeList?.Count == 0)
        {
            throw Oops.Oh("参数不能为空");
        }
        //验证传递的包是否都在齐包之内。
        List<WmsPackListOutput> packList = await _wmsCommonnQueryService.PackList(new Service.WmsCommonnQuery.Dto.PackListInput() { IsPack = true });

        List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
        foreach (var item in input.PackageCodeList)
        {
            var isExistCount = packList.Where(x => x.PackageCode == item).Count();
            if (isExistCount == 0)
            {
                throw Oops.Oh($"包{item}不是齐包状态，请检查！");
            }

            var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
            var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.人工强制待出库 || x.StockStatus == StockStatusEnum.人工强制任务已创建).Count();
            if (isExist > 0)
            {
                throw Oops.Oh($"包{item}中其中有板状态是'{StockStatusEnum.人工强制待出库.ToString()}'或'{StockStatusEnum.人工强制任务已创建.ToString()}'，不允许人工齐包出库");
            }

            //更新状态 
            foreach (var quan in quanList)
            {
                quan.StockStatus = StockStatusEnum.齐包待出库;
                quan.StockStatusName = StockStatusEnum.齐包待出库.ToString();
                quan.UpdateTime = DateTime.Now;
                quan.OperReason = "人工齐包出库";
            }
            updateQuanList.AddRange(quanList);
        }

        await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);

    }

    /// <summary>
    /// åˆ¤æ–­é½å¥—
    /// </summary>

 SDA/iWareSda/Devices/4-Station/StationModel/DB/Items/Read/StationDB2ObjForReadComm.cs

@@ -155,6 +155,13 @@
        /// </summary>
        [Description("强制出库模式")]
        public bool R_ForceOutboundMode { get; set; }

        /// <summary>
        /// å‡ºåº“模式
        /// </summary>
        [Description("出库模式")]
        public bool R_OutboundMode { get; set; }

        /// <summary>
        /// åˆåŒ…任务完成
        /// </summary>

 SDA/iWareSda/Devices/4-Station/StationModel/DB/Items/Read/StationDBForReadComm.cs

@@ -98,6 +98,12 @@
        public string R_ForceOutboundMode { get; set; }

        /// <summary>
        /// å‡ºåº“模式
        /// </summary>
        [Description("出库模式")]
        public string R_OutboundMode { get; set; }

        /// <summary>
        /// åˆåŒ…任务完成
        /// </summary>
        [Description("合包任务完成")]

 SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs

@@ -317,6 +317,7 @@
                R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "114.0",

                R_ForceOutboundMode = W_DBHeaderWithSeparate_BZ39 + "50.3",
                R_OutboundMode = W_DBHeaderWithSeparate_BZ39 + "50.5",

            });