BllExportAllot (出库分配表)增加UnstackingMode拆垛模式和LoadingAddre装车口字段

Administrator

2024-03-04 98553b87fae16011c82a6f1cdbd03846f20e95c6

BllExportAllot (出库分配表)增加UnstackingMode拆垛模式和LoadingAddre装车口字段

 HTML/views/SOSetting/ExportNotice.html

@@ -66,6 +66,7 @@
                                    <option value="5">中间品出库</option>
                                    <option value="6">代储出库</option>
                                    <option value="7">其他出库</option>
                                    <option value="8">寄存出库</option>
                                    <!-- 09 -->
                                    <!-- <option value="0">标准销售出库</option>
                                    <option value="1">非标销售出库</option>
@@ -142,7 +143,7 @@
                                <div class="layui-input-inline" style="width: 220px;">
                                    <select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
                                        <option value="0" selected>机器人拆垛</option>
                                        <option value="1">人工拆垛</option>
                                        <option value="1">PDA拆垛</option>
                                    </select>
                                </div>
                            </div>
@@ -212,6 +213,8 @@
                                            return "代储出库";
                                        case "7":
                                            return "其他出库";
                                        case "8":
                                            return "寄存出库";
                                        default:
                                            return "";
                                    }
@@ -1223,6 +1226,8 @@
                        });
                    }else if(obj.event === 'outKu'){    
                        $("#UnstackWay option[value='0']").attr("selected","selected");
                        $("#LoadingArea option[value='']").attr("selected","selected");
                        $("#PickingArea option[value='']").attr("selected","selected");
                        form.render('select');                     
                        var param = {
                            soNo: SoNo
@@ -1269,7 +1274,9 @@
                                    }
                                    var param = {
                                        soNo: data.SONo, 
                                        unstackingMode:$('#UnstackWay').val(),
                                        outMode: pa,
                                        loadingAddre:$('#LoadingArea').val()
                                    };
                                    console.log(param);
                                    sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {

 HTML/views/SOSetting/ExportNoticeAddFrom.html

@@ -42,6 +42,7 @@
                            <option value="5">中间品出库</option>
                            <option value="6">代储出库</option>
                            <option value="7">其他出库</option>
                            <option value="8">寄存出库</option>
                            <!-- 09 -->
                            <!-- <option value="0">标准销售出库</option>
                            <option value="1">非标销售出库</option>
@@ -496,6 +497,7 @@
                                    case "5": //中间品出库
                                    case "6": //代储出库
                                    case "7": //其他出库
                                    case "8": //寄存出库
                                        TypeNum = 2;
                                        console.log(TypeNum)
                                        break;

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1376,7 +1376,7 @@
        #region 下发出库、出库完成、重新下发任务、取消任务、异常处理

        // 下发出库（调用cs接口给他库位地址）
        public List<OutCommandDto> IssueOutHouse(string soNo, string outMode, int userId, string url, out string str)
        public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId, string url, out string str)
        {
            try
            {

 Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs

@@ -153,6 +153,20 @@
        /// </summary>           
        public string OutMode { get; set; }

        /// <summary>
        /// Desc:装车口
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string LoadingAddre { get; set; }

        /// <summary>
        /// Desc:拆垛模式
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string UnstackingMode { get; set; }


        [Navigate(NavigateType.OneToOne, nameof(LogisticsId))]
        public SysLogisticsInfo LogisticsInfoInfo { get; set; }

 Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs

@@ -126,7 +126,7 @@
        /// <param name="url">下发出库路径</param>
        /// <param name="str">提示信息</param>
        /// <returns>下发的指令集合</returns>
        List<OutCommandDto> IssueOutHouse(string soNo, string outMode, int userId,string url,out string str);
        List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId,string url,out string str);
        /// <summary>
        /// wcs返回的成功信号或手动完成（出库成功）
        /// </summary>

 Wms/Wms/Controllers/DownApiController.cs

@@ -42,12 +42,14 @@
        /// <summary>
        /// 指令下发（出库）
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="outMode"></param>
        /// <param name="unstackingMode">拆垛方式</param>
        /// <param name="soNo">出库单号</param>
        /// <param name="outMode">出库口</param>
        /// <param name="loadingAddre">装车口</param>
        /// <returns></returns>
        [Authorize]
        [HttpGet]
        public IActionResult IssueOutHouse(string soNo,string outMode)
        public IActionResult IssueOutHouse(string soNo,string unstackingMode, string outMode,string loadingAddre)
        {
            try
            {
@@ -68,7 +70,7 @@
                //    return Ok(new { code = 1, msg = "请选择出库口" });
                //}

                var list = _exNoticeSvc.IssueOutHouse(soNo, outMode,int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
                var list = _exNoticeSvc.IssueOutHouse(soNo,unstackingMode, outMode,loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
                
                return Ok(new { code = 0, msg = str , data = list });