hudong
2025-06-30 1e20867615150dce50f2a834cfe277bfa4749dbb
1.分拣接口拆分出回库接口
2.自动回库接口逻辑完成
5个文件已修改
303 ■■■■ 已修改文件
api/ApiModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApibackModel.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/WmsSapController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/WmsSpaHelper.cs 125 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/WMSCore.cs 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiModel.cs
@@ -376,6 +376,15 @@
            public string start { get; set; }//容器
            public int? Type { get; set; }
        }
        /// <summary>
        /// 回库参数
        /// </summary>
        public class HuiK
        {
            public string cntr_code { get; set; }//容器
            public string start { get; set; }//容器
        }
        /// <summary>
        /// 人工分拣入参
api/ApibackModel.cs
@@ -9,6 +9,50 @@
{
    public class ApibackModel
    {
        #region 成本中心
        public class CbbReturnWcBcak
        {
            public class ITEM
            {
                /// <summary>
                /// 唯一标识
                /// </summary>
                public string KEY { get; set; }
                /// <summary>
                /// 物料凭年度
                /// </summary>
                public string WLPZBH { get; set; }
                /// <summary>
                /// 返回结果标识(0成功或者1失败)字符长度1
                /// </summary>
                public int MSGCODE { get; set; }
                /// <summary>
                /// 失败原因或者成功信息字符长度255
                /// </summary>
                public string MSGDESP { get; set; }
            }
            public class ROOT
            {
                /// <summary>
                ///
                /// </summary>
                public List<ITEM> ITEM { get; set; }
            }
            public class Root
            {
                /// <summary>
                ///
                /// </summary>
                public ROOT ROOT { get; set; }
            }
        }
        #endregion
        #region 外采入庫回調
        public class WcRkBc { 
     
api/WmsSapController.cs
@@ -492,7 +492,16 @@
        {
            return WmsSpaHelper.OutboundOrderSorting(model);
        }
        /// <summary>
        /// 回库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public Task<SimpleResult> HkGet(HuiK model)
        {
            return WmsSpaHelper.HkGets(model);
        }
        /// <summary>
        /// 空托出入库
        /// </summary>
api/WmsSpaHelper.cs
@@ -1929,7 +1929,7 @@
                            if (khsta != null)
                            {
                                LogHelper.Info($"starts{khsta}");
                                LogHelper.Info($"starts{khsta?.S_CNTR_CODE}");
                                var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == khsta.S_CNTR_CODE).First();
                                if (starts12==null)
                                {
@@ -1941,9 +1941,9 @@
                                else
                                {
                                    LogHelper.Info($"starts1{starts12}");
                                    LogHelper.Info($"starts1{starts12.S_LOC_CODE}");
                                    start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
                                    LogHelper.Info($"starts2{start}");
                                    LogHelper.Info($"starts2{start?.S_CODE}");
                                    model.cntr_code = starts12?.S_CNTR_CODE;
                                }
@@ -2141,7 +2141,7 @@
                    }
                    else
                    {
                        result.resultMsg = "出库单号不能为空";
                        result.resultMsg = $"{model.cntr_code}容器未找到货位信息";
                        result.resultCode = 1;
                        return result;
                    }
@@ -2473,7 +2473,85 @@
        }
        //}
        public static async Task<SimpleResult>  HkGets(HuiK model) {
            var db = new SqlHelper<object>().GetInstance();
            SimpleResult result = new SimpleResult();
                var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == model.cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();
                if (locs != null)
                {
                    var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();
                    if (cntr != null)
                    {
                        cntr.S_SORT_TYPE = "已分拣";
                        db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
                    }
                    else
                    {
                        result.resultCode = 1;
                        result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
                        return result;
                    }
                    Location endloc = new Location();
                    LogHelper.Info($"获取托盘信息{model.cntr_code}容器");
                    var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
                    if (hwbd != null)
                    {
                        endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
                        if (endloc?.N_LOCK_STATE != 0)
                        {
                            result.resultCode = 3;
                            result.resultMsg = $"终点库位已锁/不存在";
                            return result;
                        }
                    }
                    else
                    {
                        result.resultCode = 3;
                        result.resultMsg = $"{model.cntr_code}托盘找不到货位";
                        return result;
                    }
                var startloc = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
                //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
                var wmsTask = new WMSTask
                    {
                        S_CNTR_CODE = model.cntr_code,
                        S_CODE = WMSHelper.GenerateTaskNo(),
                        S_START_LOC = model.start,
                        S_START_AREA = startloc.S_AREA_CODE,
                        S_START_WH = startloc.S_WH_CODE,
                        //S_END_LOC = start,
                        //S_END_AREA = startinfo.S_AREA_CODE,
                        //S_END_WH = startinfo.S_AREA_CODE,
                        S_END_LOC = endloc?.S_CODE,
                        S_END_AREA = endloc?.S_AREA_CODE,
                        S_END_WH = endloc?.S_WH_CODE,
                        N_TYPE = 1,
                        // S_TYPE = WMSTask.GetTypeStr(1),
                        S_TYPE = "回库",
                        S_OP_DEF_CODE = "",
                        S_OP_DEF_NAME = "pda入库"
                    };
                    if (WMSHelper.CreateWmsTask(wmsTask))
                    {
                        LocationHelper.LockLoc(model.start, 1);
                        result.resultMsg = $"创建作业成功,作业号{wmsTask.S_CODE}";
                    }
                }
                else
                {
                    result.resultCode = 1;
                    result.resultMsg += $"找不到容器对应任务信息{model.cntr_code}";
                    return result;
                }
                return result;
        }
        /// <summary>
@@ -2532,7 +2610,7 @@
                    ckbitem.CBZX = po.S_CBZX;
                    ckbitem.WLBH = item.item_code;
                    ckbitem.SL = item.qty;
                    ckbitem.KCDD = podetail?.S_KCDD;
                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
                    ckbitem.LRZX = po.S_LRZX;
                    ckbitem.ZZKM = po.S_ZZKM;
                    ckbitem.GC = po.S_FACTORY;
@@ -2572,17 +2650,7 @@
                string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
                LogHelper.Info($"成本中心出库xml数据{xml}");
                //// 创建 StringContent 并指定媒体类型为 "text/xml"
                //HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
                //string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
                //string responseXml = "";
                //using (HttpClient client = new HttpClient())
                //{
                //    // 发送 POST 请求并接收响应
                //    HttpResponseMessage responsess = await client.PostAsync(url, content);
                //    responseXml = await responsess.Content.ReadAsStringAsync();
                //}
                #region sap回调
                // 创建Web Service代理类实例
@@ -2606,12 +2674,13 @@
                XmlDocument xmlDoc = new XmlDocument();
                xmlDoc.LoadXml(responses.Output.ToString());
                JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
                var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
                EnsureArrayFormat(jsonObject, "ITEM", "");
                var data = JsonConvert.DeserializeObject<CbbReturnWcBcak.Root>(jsonObject.ToString());
                //添加凭证记录表
                result.resultMsg = data.ROOT.ITEM.MSGDESP;
                result.resultCode = data.ROOT.ITEM.MSGCODE;
                if (data.ROOT.ITEM.MSGCODE == 0)
                result.resultMsg = data.ROOT.ITEM[0].MSGDESP;
                result.resultCode = data.ROOT.ITEM[0].MSGCODE;
                if (data.ROOT.ITEM[0].MSGCODE == 0)
                {
                    foreach (var item in MaterList)
@@ -2621,8 +2690,8 @@
                        materialVoucher.S_TYPE = po.S_OUT_TYPE;
                        materialVoucher.S_WLBM = item.item_code;
                        materialVoucher.S_WLH = item.N_ROW_NO;
                        materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
                        materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
                        materialVoucher.S_WLPZBH = data.ROOT.ITEM?[0].WLPZBH;
                        //materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
                        materialVoucher.S_WH_CODE = po.S_WH_CODE;
                        materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
                        materialVoucher.F_QTY = item.qty;
@@ -2631,13 +2700,6 @@
                        materialVoucher.UNAME = po.UNAME;
                        db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
                    }
                    //MaterialVoucher materialVoucher = new MaterialVoucher();
                    //materialVoucher.S_NO = po.S_NO;
                    //materialVoucher.S_TYPE = po.S_OUT_TYPE;
                    //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
                    //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
                    //materialVoucher.STATUS = 0;
                    //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
                }
                #endregion
@@ -2731,7 +2793,7 @@
                    ckbitem.DDH = podetail?.S_DDH;
                    //ckbitem.DDHXM = (podetail?.N_ROW_NO);
                    ckbitem.WBS = podetail?.S_WBS;
                    ckbitem.KCDD = podetail?.S_KCDD;
                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
                    ckbitem.PC = podetail?.S_BATCH_NO;
                    JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
                    //string[] xlhValues = item.S_SERIAL_NO.Split(',');
@@ -3091,7 +3153,7 @@
                    ckbitem.YLBH = podetail?.S_YLBH;
                    ckbitem.YLXMH = podetail?.S_YLXMH;
                    ckbitem.GC = po.S_FACTORY;
                    ckbitem.KCDD = podetail?.S_KCDD;
                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
                    CkBcakDto.ITEM1 listitem1 = new CkBcakDto.ITEM1();
                    //var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == item.item_code&&a.N_ROW_NO==item.N_ROW_NO).ToList();
@@ -3527,6 +3589,7 @@
                                        S_YLXMH = a.YLHXM,
                                        S_BATCH_NO = "",
                                        S_ERP_WH_CODE = a.KCDD,
                                        S_ZJWLTH = a.ZJWLTH,
                                        S_ZJWLMS = a.ZJWLMS,
                                        S_ZHFHBS = a.ZHFHBS,
core/WMSCore.cs
@@ -135,81 +135,83 @@
            {
                foreach (var item in list)
                {
                    var cir2 = db.Queryable<CGRels>().Where(a => a.S_ITEM_CODE == item.S_ITEM_CODE).First();
                    var cir2 = db.Queryable<CGRels>().Where(a => a.S_ITEM_CODE == item.S_ITEM_CODE&&a.S_CNTR_TYPE=="半托").First();
                    var S_CNTR_CODE = "";
                    if (cir2 != null)
                    {
                        S_CNTR_CODE=cir2.S_CNTR_CODE;
                    }
                    var lcr = db.Queryable<LocCntrRel>().Where(c => c.S_CNTR_CODE == S_CNTR_CODE).First();
                    if (lcr != null)
                    {
                        //起始库位
                        var startloc = db.Queryable<Location>().Where(it => it.S_CODE == lcr.S_LOC_CODE).First();
                        var wsc= db.Queryable<WCSTask>().Where(it => it.S_CODE == lcr.S_LOC_CODE&&it.N_B_STATE<3).First();
                        if (wsc!=null)
                        var lcr = db.Queryable<LocCntrRel>().Where(c => c.S_CNTR_CODE == S_CNTR_CODE).First();
                        if (lcr != null)
                        {
                            item.N_B_STATE = 2;
                            db.Updateable(item).UpdateColumns(it => new {  it.N_B_STATE }).ExecuteCommand();
                        }
                        else
                        {
                            if (startloc != null)//&&
                            //起始库位
                            var startloc = db.Queryable<Location>().Where(it => it.S_CODE == lcr.S_LOC_CODE).First();
                            var wsc = db.Queryable<WCSTask>().Where(it => it.S_CNTR_CODE == S_CNTR_CODE && it.N_B_STATE < 3).First();
                            if (wsc != null)
                            {
                                //终点货位
                                var endloc = db.Queryable<Location>().Where(it => it.S_AREA_CODE == "QYQXHQ" && it.N_LOCK_STATE == 0 && it.N_CURRENT_NUM == 0).First();
                                // var endloc = db.Queryable<Location>().Where(it => it.S_CODE == item.S_END_LOC).First();
                                if (endloc != null)
                                item.N_B_STATE = 2;
                                db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                            }
                            else
                            {
                                if (startloc != null)//&&
                                {
                                    var optask = new WMSTask
                                    {
                                        S_CODE = WMSHelper.GenerateTaskNo(),
                                        S_START_LOC = startloc.S_CODE,
                                        S_START_AREA = startloc.S_AREA_CODE,
                                        S_START_WH = startloc.S_WH_CODE,
                                        S_END_LOC = endloc.S_CODE,
                                        S_END_AREA = endloc.S_AREA_CODE,
                                        S_END_WH = endloc.S_WH_CODE,
                                        S_TYPE = "出库区",
                                        N_TYPE = 2,
                                        N_B_STATE = 0,
                                        S_BS_NO = "",
                                        S_CNTR_CODE = S_CNTR_CODE,
                                        S_OP_DEF_NAME = item.S_BS_TYPE
                                    };
                                    var res = db.Insertable(optask).ExecuteCommand() > 0;
                                    if (res)
                                    {
                                        startloc.N_LOCK_STATE = 2;
                                        startloc.S_LOCK_STATE = "出库锁";
                                        db.Updateable(startloc).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                                        LocationHelper.LockLoc(endloc.S_CODE, 1);
                                        item.N_B_STATE = 2;
                                        db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                                    //终点货位
                                    var endloc = db.Queryable<Location>().Where(it => it.S_AREA_CODE == "QYQXHQ" && it.N_LOCK_STATE == 0 && it.N_CURRENT_NUM == 0).First();
                                    // var endloc = db.Queryable<Location>().Where(it => it.S_CODE == item.S_END_LOC).First();
                                    if (endloc != null)
                                    {
                                        var optask = new WMSTask
                                        {
                                            S_CODE = WMSHelper.GenerateTaskNo(),
                                            S_START_LOC = startloc.S_CODE,
                                            S_START_AREA = startloc.S_AREA_CODE,
                                            S_START_WH = startloc.S_WH_CODE,
                                            S_END_LOC = endloc.S_CODE,
                                            S_END_AREA = endloc.S_AREA_CODE,
                                            S_END_WH = endloc.S_WH_CODE,
                                            S_TYPE = "出库区",
                                            N_TYPE = 2,
                                            N_B_STATE = 0,
                                            S_BS_NO = "",
                                            S_CNTR_CODE = S_CNTR_CODE,
                                            S_OP_DEF_NAME = item.S_BS_TYPE
                                        };
                                        var res = db.Insertable(optask).ExecuteCommand() > 0;
                                        if (res)
                                        {
                                            startloc.N_LOCK_STATE = 2;
                                            startloc.S_LOCK_STATE = "出库锁";
                                            db.Updateable(startloc).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                                            LocationHelper.LockLoc(endloc.S_CODE, 1);
                                            item.N_B_STATE = 2;
                                            db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                                        }
                                    }
                                    else
                                    {
                                        LogHelper.Info($"{item.S_BS_NO}配盘 库区AGVXHQ无空货位");
                                    }
                                }
                                else
                                {
                                    LogHelper.Info($"{item.S_BS_NO}配盘 库区AGVXHQ无空货位");
                                    LogHelper.Info($"{item.S_BS_NO}配盘 库区无货位");
                                }
                            }
                            else
                            {
                                LogHelper.Info($"{item.S_BS_NO}配盘 库区无货位");
                            }
                        }
                        else
                        {
                            LogHelper.Info($"配盘生成作业容器未绑定货位");
                        }
                    }
                    else
                    {
                        LogHelper.Info($"配盘生成作业容器未绑定货位");
                        LogHelper.Info($"未找到物料{item.S_ITEM_CODE}对应的容器");
                    }
                }