完善ERP出库下发任务及来源单号、记录表的字段更新

kazelee

2025-05-29 e2303b1125817cb7887e36d5905c8f1661d685a3

 api/MoboxController.cs

@@ -14,37 +14,18 @@
    [RoutePrefix("api")]
    public class MoboxController : ApiController {
        /// <summary>
        /// 好运箱-满托下线入库(PDA)
        /// 好运箱-满箱下线入库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("goodpack-offline")]
        public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            LogHelper.InfoApi("好运箱-满托下线入库(PDA)", model);
            var apiName = "好运箱-满托下线入库(PDA)";
            LogHelper.InfoApi(apiName, model);

            return ApiHelper.GoodpackOffline(model);
        }

        ///// <summary>
        ///// 空托/空箱入库绑定(PDA)
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //public SimpleResult EmptyBind(EmptyBindInfo model) {
        //    LogHelper.InfoApi("空托/空箱绑定", model);

        //    if (model.CntrType == "托盘") {
        //        //LogHelper.Info($"触发API：空托绑定 " + JsonConvert.SerializeObject(model), "API");
        //        return ApiHelper.EmptyBindPallet(model);
        //    }
        //    else if (model.CntrType == "好运箱") {
        //        //LogHelper.Info($"触发API：空箱绑定 " + JsonConvert.SerializeObject(model), "API");
        //        return ApiHelper.EmptyBindGoodpack(model);
        //    }
        //    else {
        //        return BuildSimpleResult(-1, $"不合法的容器类型：'{model.CntrType}'");
        //    }
        //}

        /// <summary>
        /// 空托/空箱入库(PDA)
@@ -54,50 +35,19 @@
        [HttpPost]
        [Route("empty-inbound")]
        public SimpleResult EmptyInbound(EmptyInboundInfo model) {
            LogHelper.InfoApi("空托/空箱入库", model);
            var apiName = "空托/空箱入库";
            LogHelper.InfoApi(apiName, model);

            if (model.CntrType == "托盘") {
            if (model.CntrType == "空托盘") {
                return ApiHelper.EmptyInboundPallet(model);
            }
            else if (model.CntrType == "好运箱") {
            else if (model.CntrType == "空好运箱") {
                return ApiHelper.EmptyInboundGoodpack(model);
            }
            else {
                return NewSimpleResult(-1, $"容器类型 '{model.CntrType}' 不合法：应为 '托盘' 或 '好运箱'");
                return NewSimpleResult(-1, $"容器类型 '{model.CntrType}' 不合法：应为 '空托盘' 或 '空好运箱'");
            }
        }

        ///// <summary>
        ///// 空托/空箱上线(PDA)
        ///// </summary>
        ///// <returns>
        ///// 人工使用PDA扫码，根据物料类型判断上线空托/空箱
        ///// </returns>
        //public SimpleResult EmptyOnline(EmptyOnlineInfo model) {
        //    var db = DbHelper.GetDbClient();
        //    var locCntrRel = db.Queryable<TN_Loc_Container>()
        //        .LeftJoin<TN_CG_Detail>((lc, cd) => lc.S_CNTR_CODE == cd.S_CNTR_CODE)
        //        .Where((lc, cd) => cd.S_ITEM_CODE == model.ItemCode)
        //        .First();

        //    if (locCntrRel.S_CNTR_TYPE == "托盘") {

        //        return ApiHelper.EmptyOnlinePallet(new EmptyOnlinePalletInfo {
        //            CntId = locCntrRel.S_CNTR_CODE,
        //            EndLoc = model.EndLoc
        //        });
        //    }
        //    else if (locCntrRel.S_CNTR_TYPE == "好运箱") {

        //        return ApiHelper.EmptyOnlineGoodpack(new EmptyOnlineGoodpackInfo {
        //            CntId = locCntrRel.S_CNTR_CODE,
        //            EndLoc = model.EndLoc
        //        });
        //    }
        //    else {
        //        return BuildSimpleResult(-1, $"不合法的容器类型：'{locCntrRel.S_CNTR_CODE}'");
        //    }
        //}

        /// <summary>
        /// 托盘-空托上线(PDA)
@@ -107,6 +57,8 @@
        [HttpPost]
        [Route("empty-online-pallet")]
        public SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var apiName = "托盘-空托上线(PDA)";
            LogHelper.InfoApi(apiName, model);
            return ApiHelper.EmptyOnlinePallet(model);
        }

@@ -118,26 +70,10 @@
        [HttpPost]
        [Route("empty-online-goodpack")]
        public SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            var apiName = "好运箱-空箱上线(PDA)";
            LogHelper.InfoApi(apiName, model);
            return ApiHelper.EmptyOnlineGoodpack(model);
        }

        ///// <summary>
        ///// 合格回库/不合格移库
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //[HttpPost]
        //[Route("CheckShift")]
        //public SimpleResult CheckShift(CheckShiftInfo model) {
        //    LogHelper.InfoApi("合格回库/不合格移库", model);

        //    if (model.Qualified) {
        //        return ApiHelper.QualifiedBack(model);
        //    }
        //    else {
        //        return ApiHelper.UnqualifiedShift(model);
        //    }
        //}

        /// <summary>
        /// 合格回库(PDA)
@@ -146,6 +82,8 @@
        [HttpPost]
        [Route("qualified-back")]
        public SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var apiName = "合格回库(PDA)";
            LogHelper.InfoApi(apiName, model);
            return ApiHelper.QualifiedBack(model);
        }

@@ -156,6 +94,8 @@
        [HttpPost]
        [Route("unqualified-shift")]
        public SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var apiName = "不合格移库(PDA)";
            LogHelper.InfoApi(apiName, model);
            return ApiHelper.UnqualifiedShift(model);
        }

@@ -167,6 +107,8 @@
        [HttpPost]
        [Route("rest-back")]
        public SimpleResult RestBack(RestBackInfo model) {
            var apiName = "余料尾箱回库(PDA)";
            LogHelper.InfoApi(apiName, model);
            return ApiHelper.RestBack(model);
        }

@@ -178,7 +120,8 @@
        [HttpPost]
        [Route("finished-outbound")]
        public SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
            LogHelper.InfoApi("成品胶出库(PDA)", model);
            var apiName = "成品胶出库(PDA)";
            LogHelper.InfoApi(apiName, model);

            if (model.ForcedOut) {
                return ApiHelper.FinishedOutboundForce(model);
@@ -188,26 +131,5 @@
            }
        }

        /// <summary>
        /// 抽检-创建抽检单(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("create-check-order")]
        public SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
            return ApiHelper.CreateCheckOrder(model);
        }

        /// <summary>
        /// 移库-创建移库任务(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("shift-storage")]
        public SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
            return ApiHelper.CreateShiftOrder(model);
        }
    }
}