222

schangxiang@126.com

2024-12-14 f3a78b9ef7ec02b255dc52bf2b85f52c1cefa777

222

 CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs

@@ -181,23 +181,23 @@
        [Description("正常")]
        正常 = 1,

        /// <summary>
        /// 封存
        /// </summary>
        [Description("封存")]
        封存 = 2,
        ///// <summary>
        ///// 封存
        ///// </summary>
        //[Description("封存")]
        //封存 = 2,

        /// <summary>
        /// 禁出  --不用了
        /// </summary>
        [Description("禁出")]
        禁出 = 3,
        ///// <summary>
        ///// 禁出  --不用了
        ///// </summary>
        //[Description("禁出")]
        //禁出 = 3,

        /// <summary>
        /// 禁入 --不用了
        /// </summary>
        [Description("禁入")]
        禁入 = 4,
        ///// <summary>
        ///// 禁入 --不用了
        ///// </summary>
        //[Description("禁入")]
        //禁入 = 4,

        /// <summary>
        /// 锁定

 LA24030_LuLiPackageLine_Pda/components/buttonModal.vue

@@ -113,6 +113,6 @@
//     // font-size: 16px !important;
// }
uni-button{
    padding-right: 10px !important;
    padding-right: 5px !important;
}
</style>

 LA24030_LuLiPackageLine_Pda/manifest.json

@@ -2,7 +2,7 @@
    "name" : "LuLiMuYe_Package_Pda",
    "appid" : "__UNI__28D87EB",
    "description" : "2024.12.14",
    "versionName" : "1.0.4",
    "versionName" : "1.0.5",
    "versionCode" : "100",
    "transformPx" : false,
    "app-plus" : {

 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue

@@ -56,25 +56,27 @@
                <count-view :countData="countList"></count-view>
                <div class="box100">
                    <div v-for="(item, index) in dataList" :key="index" class="box100Inner">
                        <p class="t1">{{ item.laneNo }}#立体库</p>
                        <p class="t1">{{ item.laneNo }}#排</p>
                        <div class="storage-grid">
                            <div class="row rowMy0">
                                <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
                                    <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
                                <!-- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20"> -->
                                    <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
                                    <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
                                        {{ cell.placeCode }} 
                                    </span>
                                </div>
                            </div>
                            <div class="row rowMy1">
                                <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 20 && cellIndex < 40">
                                    <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
                                    <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
                                        {{ cell.placeCode }} 
                                    </span>
                                </div>
                            </div>
                            <div class="row rowMy2">
                                <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
                                    <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
                                <!-- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60"> -->
                                    <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
                                    <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
                                        <!-- {{ cell.laneNo }} -->
                                        {{ cell.placeCode }} 
                                        <!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
@@ -123,43 +125,20 @@
// }


const setBgColor = (type: number): string => {
const setBgColor = (type: number,upi:string): string => {
    let color = '';
    switch (type) {

        case 1:
    //debugger
    if(upi!=null){
        color = '#2BA6FF'; //蓝色  在库
        break;

        case 2:
        return color;
    }
    switch (type) {
        case 5:
        color = '#FF0000'; //红色  已冻结
        break;
default:
        default:
        color = '#F6C285'; //橘色  正常
        break;
        // case 3:
        // color = '#FFFF00'; //黄色 禁出
        // break;


        // case 1:
        //     color = '#F6C285'; //橘色  正常#F18201
        //     break;
        //     case 2:
        //     color = '#FF0000'; //红色  锁定
        //     break;
        // // case 2:
        // //     color = '#2BA6FF'; //蓝色 封存
        //     break;
        // case 3:
        //     color = '#FFFF00'; //黄色 禁出
        //     break;

        // // case 4:
        // //     color = '#A2A2A2'; //灰色 禁入
        // //     break;

	
    }
    return color;
};
@@ -239,7 +218,7 @@
            {
                type: 2,
                title: '锁定库位:',
                count: result.filter((item: any) => item.stockStatus == 2).length || 0,
                count: result.filter((item: any) => item.placeStatus == 5).length || 0,
            },
        ];


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

@@ -507,7 +507,9 @@
                }
            );
            handleQuery();
            //ElMessage.success('齐包出库请求成功');
            if(ret.data.type=="success"){
                ElMessage.success('齐包出库请求成功');
                }
            loading.value = false;
        })
        .catch(() => ElMessage.info('已取消'));
@@ -531,8 +533,11 @@
                }
            );
            handleQuery();
            //ElMessage.success('强制出库请求成功');
            loading.value = false;
            if(ret.data.type=="success"){
                ElMessage.success('强制出库请求成功');
                }
			
                loading.value = false;
        })
        .catch(() => ElMessage.info('已取消'));
};

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs

@@ -178,23 +178,23 @@
    [Description("正常")]
    正常 = 1,

    /// <summary>
    /// 封存
    /// </summary>
    [Description("封存")]
    封存 = 2,
    ///// <summary>
    ///// 封存
    ///// </summary>
    //[Description("封存")]
    //封存 = 2,

    /// <summary>
    /// 禁出  --不用了
    /// </summary>
    [Description("禁出")]
    禁出 = 3,
    ///// <summary>
    ///// 禁出  --不用了
    ///// </summary>
    //[Description("禁出")]
    //禁出 = 3,

    /// <summary>
    /// 禁入 --不用了
    /// </summary>
    [Description("禁入")]
    禁入 = 4,
    ///// <summary>
    ///// 禁入 --不用了
    ///// </summary>
    //[Description("禁入")]
    //禁入 = 4,

    /// <summary>
    /// 锁定

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

@@ -95,6 +95,11 @@
            //更新状态 
            foreach (var quan in quanList)
            {
                if (quan.StockStatus != StockStatusEnum.在库 && quan.StockStatus != StockStatusEnum.已冻结)
                {
                    throw Oops.Oh($"部件条码{quan.Upi}的库存状态不是'{StockStatusEnum.在库.ToString()}或{StockStatusEnum.已冻结.ToString()}'状态");
                }

                quan.StockStatus = StockStatusEnum.人工强制待出库;
                quan.StockStatusName = StockStatusEnum.人工强制待出库.ToString();
                quan.UpdateTime = DateTime.Now;
@@ -153,6 +158,10 @@
            //更新状态 
            foreach (var quan in quanList)
            {
                if (quan.StockStatus != StockStatusEnum.在库 && quan.StockStatus != StockStatusEnum.已冻结)
                {
                    throw Oops.Oh($"部件条码{quan.Upi}的库存状态不是'{StockStatusEnum.在库.ToString()}或{StockStatusEnum.已冻结.ToString()}'状态");
                }
                quan.StockStatus = StockStatusEnum.齐包待出库;
                quan.StockStatusName = StockStatusEnum.齐包待出库.ToString();
                quan.UpdateTime = DateTime.Now;