add

zongzhibin

2024-11-28 e01a2b8111b8d9204b8f322709a9233969e26294

add

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/DataProcess_BZ12.cs

@@ -87,11 +87,11 @@
                                placeX = (short)upiObj.MachineXCenter;
                                placeY = (short)upiObj.MachineYCenter;
                                placeZ = (short)upiObj.MachineZCenter;
                                if (upiObj.UpiStatus == 3||upiObj.UpiStatus==5)
                                if (upiObj.UpiStatus == (int)UpiStatusEnum.已码垛||upiObj.UpiStatus== (int)UpiStatusEnum.码垛中)
                                {
                                    continue;
                                }
                                upiObj.UpiStatus = 5;
                                upiObj.UpiStatus = (int)UpiStatusEnum.码垛中;
                                //查处这包所有的数量
                                var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
                                //查询是否末板并且判断有没有混批

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs

@@ -67,7 +67,7 @@
                            short placeX = 0;
                            short placeY = 0;
                            short placeZ = 0;
                            string place = "";
                            string place = "22";
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //要是有已下发的任务，就不要执行
@@ -83,10 +83,11 @@
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
                                }

                                placeX = (short)upiObj.MachineXCenter;
                                placeY = (short)upiObj.MachineYCenter;
                                placeZ = (short)upiObj.MachineZCenter;
                                cartonhigh = (short)upiObj.Info1;
                                cartonhigh = (short)upiObj.Info3;
                                cartonwidth = (short)upiObj.Info2;

                                //记录任务
@@ -98,10 +99,12 @@
                                    PackageCode=upiObj.PackageCode,
                                    PushStatus=0,
                                    PushNum=0,
                                    ApiMessage="11",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "CC",
                                    UpdateTime = DateTime.Now,
                                    UpdateUserName = "CC",
                                    CreateOrgName="11"
                                };
                                var task = new wms_rbline_task()
                                {
@@ -116,10 +119,10 @@
                                    OrderId = upiObj.OrderId,
                                    PackageCode = upiObj.PackageCode,
                                    RbTaskType = (int)RbTaskTypeEnum.夹板任务,
                                    RbTaskTypeEnumName = RbTaskTypeEnum.码板任务.ToString(),
                                    RbTaskTypeEnumName = RbTaskTypeEnum.夹板任务.ToString(),
                                    TaskStatus = (int)TaskStatusEnum.已下发,
                                    TaskStatusName = TaskStatusEnum.已下发.ToString(),
                                    TaskMsg = "码板",
                                    TaskMsg = "夹板",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "CC",
                                    UpdateTime = DateTime.Now,
@@ -128,12 +131,12 @@
                                };

                                wmsDB.wms_rbline_task.Add(task);
                                wmsDB.mes_push_packagecode.Add(putpakegecode);
                               // wmsDB.mes_push_packagecode.Add(putpakegecode);
                                using (StationServiceClient client = new StationServiceClient())
                                {

                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, Convert.ToInt32(task.TaskNo), 
                                          (short)upiObj.Info1, (short)upiObj.Info2,cartonhigh,cartonwidth,placeX,placeY);
                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo), 
                                          (short)upiObj.Length, (short)upiObj.Width,cartonhigh,cartonwidth,placeX,placeY);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-下发入库任务 å¤±è´¥,WriteInStoreTaskInfoAsync è¿”回:{res.resMsg}";

 CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs

@@ -29,20 +29,28 @@
    å·²é½åŒ… = 2,

    /// <summary>
        /// ç åž›ä¸­
        /// </summary>
        [Description("码垛中")]
        ç åž›ä¸­ = 3,


        /// <summary>
    /// å·²ç åž›
    /// </summary>
    [Description("已码垛")]
    å·²ç åž› = 3,
        å·²ç åž› = 4,

    /// <summary>
    /// å·²åˆåŒ…
    /// </summary>
    [Description("已合包")]
    å·²åˆåŒ… = 4,
        å·²åˆåŒ… = 5,

    /// <summary>
    /// ç åž›ä¸­
        /// å·²ä¸‹çº¿
    /// </summary>
    [Description("码垛中")]
    ç åž›ä¸­ = 5,
        [Description("已下线")]
        å·²ä¸‹çº¿ = 6
    }
}

 SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs

@@ -91,38 +91,38 @@
        /// åŒ…件长
        /// </summary>
        [Description("包件长")]
        public string W_PackageLength { get; set; }
        public short W_PackageLength { get; set; }

        /// <summary>
        /// åŒ…件宽
        /// </summary>
        [Description("包件宽")]
        public string W_PackageWidth { get; set; }
        public short W_PackageWidth { get; set; }


        /// <summary>
        /// çº¸ç®±é«˜
        /// </summary>
        [Description("纸箱高")]
        public string W_CartonHeight { get; set; }
        public short W_CartonHeight { get; set; }

        /// <summary>
        /// çº¸ç®±å®½
        /// </summary>
        [Description("纸箱宽")]
        public string W_CartonWidth { get; set; }
        public short W_CartonWidth { get; set; }

        /// <summary>
        /// æ”¾æ–™X偏移
        /// </summary>
        [Description("放料X偏移")]
        public string W_X_Offset { get; set; }
        public short W_X_Offset { get; set; }

        /// <summary>
        /// æ”¾æ–™Y偏移
        /// </summary>
        [Description("放料Y偏移")]
        public string W_Y_Offset { get; set; }
        public short W_Y_Offset { get; set; }

        /// <summary>
        /// å…¥åº“完成已确认
@@ -197,7 +197,7 @@
        /// åˆåŒ…任务号
        /// </summary>
        [Description("合包任务号")]
        public int W_SurroundTaskNo { get; set; }
        public short W_SurroundTaskNo { get; set; }
        /// <summary>
        /// ç åž›é¦–末板
        /// </summary>

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

@@ -547,7 +547,7 @@
        /// <param name="placey"></param>
        /// <param name="msg"></param>
        /// <returns></returns>
        public bool WriteSurroundTaskInfo(string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, out string msg)
        public bool WriteSurroundTaskInfo(string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, out string msg)
        {
            try
            {

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

@@ -288,7 +288,7 @@
            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
            {
                StationCode = StationLocationEnum.BZ21.ToString(),
                R_PalletizingAck = W_DBHeaderWithSeparate_BZ12 + "50.2",
                R_PalletizingAck = W_DBHeaderWithSeparate_BZ21 + "50.2",

                R_ReqParseData = W_DBHeaderWithSeparate_BZ21 + "50.0",
                R_SurrouondTaskFinish = W_DBHeaderWithSeparate_BZ21 + "50.1",

 SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs

@@ -160,7 +160,7 @@
        SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode);

        [OperationContract]
        SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
        SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
        
        [OperationContract]
        SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode);

 SDA/iWareSda/Devices/4-Station/StationService/StationService.cs

@@ -635,7 +635,7 @@
        /// <param name="deviceId"></param>
        /// <param name="value"></param>
        /// <returns></returns>
        public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
        public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
        {
            SdaResEntity _SdaResEntity = new SdaResEntity();
            try