删除有问题的TCP旧代码, 优化事务处理和ERP数据模型

kazelee

10 天以前 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6

 api/DebugController.cs

@@ -3,21 +3,17 @@
using System.IO;
using System.Runtime.ConstrainedExecution;
using System.Web.Http;

using HH.WCS.Mobox3.DSZSH.core;
using HH.WCS.Mobox3.DSZSH.device;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;

using Newtonsoft.Json;

using SqlSugar;

using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.Config;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
using static HH.WCS.Mobox3.DSZSH.util.Config;

namespace HH.WCS.Mobox3.DSZSH.api {
    /// <summary>
@@ -97,7 +93,7 @@
        [HttpPost]
        [Route("AddInboundTask")]
        public string AddInboundTask(AddInboundTaskInfo model) {
            return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Content;
            return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Item2;
        }

        /// <summary>
@@ -113,7 +109,7 @@
            try {
                // 查询起点货位:数量=0
                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where((l,c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
                    .Where((l, c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
                if (startLoc == null) {
                    return $"没有找到起点货位'{model.StartLoc}'!要求:锁状态='无',当前容器数量=1";
                }
@@ -143,12 +139,11 @@
                        return "数据库操作失败!";
                    }

                    tran.CommitTran() ;
                    tran.CommitTran();
                    return "数据库操作成功";
                }
            }
            catch (Exception ex) {

                return ex.Message;
            }
        }
@@ -160,18 +155,18 @@
        /// <returns></returns>
        [HttpPost]
        [Route("TestErpSendOutboundPlan")]
        public ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
        public ErpModel.ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
            var apiName = "ERP下发出库计划单";
            //LogHelper.InfoApi(apiName, model);

            var erpModel = new ErpSendOutboundPlanInfo();
            var erpModel = new ErpModel.ErpSendOutboundPlanInfo();
            erpModel.jhdh = model.PlanNo;
            erpModel.cpdm = model.ItemCode;
            erpModel.pzjs = model.ItemNum;

            LogHelper.InfoApi(apiName, erpModel);

            return ApiHelper.ErpSendOutboundPlan(erpModel);
            return ErpService.ErpSendOutboundPlan(erpModel);
        }

        /// <summary>
@@ -181,7 +176,7 @@
        /// <returns></returns>
        [HttpPost]
        [Route("PickUpReturn")]
        public TestErpResult PickUpReturn(PickUpReturnErpInfo model) {
        public TestErpResult PickUpReturn(ErpModel.PickUpReturnErpInfo model) {
            if (model.sfjs == 0) {
                return new TestErpResult {
                    code = 1,
@@ -202,7 +197,7 @@
        /// <returns></returns>
        [HttpPost]
        [Route("CreateTaskReturn")]
        public TestErpResult CreateTaskReturn(CreateTaskReturnErpInfo model) {
        public TestErpResult CreateTaskReturn(ErpModel.CreateTaskReturnErpInfo model) {
            if (model.hw == "") {
                return new TestErpResult {
                    code = 1,
@@ -215,6 +210,22 @@
                message = "success"
            };
        }

        [HttpPost]
        public string TestDb() {
            var db = new SqlHelper<object>().GetInstance();
            var startAreas = new List<string> { "HJQ", "CKQ" };
            //var locationQuery = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");
            //LogHelper.Info(locationQuery.ToSqlString());
            ////var location = locationQuery.First();
            //var newLocationQuery = DbQuery.StartLoc(db, "a", startAreas);
            //LogHelper.Info(newLocationQuery.ToSqlString());
            //locationQuery = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");

            var locationQuery = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: startAreas));
            LogHelper.Info(locationQuery.ToSqlString());
            return locationQuery.ToSqlString();
        }
    }

    public class GoodpackToProdLineInfo {