From 0821715ebc11d3934d0594a1cc2c39686d808906 Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期五, 09 七月 2021 14:12:43 +0800
Subject: [PATCH] 增加ChageWay接口
---
HH.WMS.BLL/External/WmsApiBaseBLL.cs | 141 +++++++++++++++++++++++++++--------------------
1 files changed, 81 insertions(+), 60 deletions(-)
diff --git a/HH.WMS.BLL/External/WmsApiBaseBLL.cs b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
index e40b0c7..f737913 100644
--- a/HH.WMS.BLL/External/WmsApiBaseBLL.cs
+++ b/HH.WMS.BLL/External/WmsApiBaseBLL.cs
@@ -2,6 +2,7 @@
using HH.WMS.BLL.Basic;
using HH.WMS.BLL.InStock;
using HH.WMS.BLL.Interface;
+using HH.WMS.BLL.Pda;
using HH.WMS.BLL.SysMgr;
using HH.WMS.Common;
using HH.WMS.Common.Algorithm;
@@ -19,6 +20,7 @@
using HH.WMS.Entitys.Common;
using HH.WMS.Entitys.Dto;
using HH.WMS.Entitys.Entitys;
+using HH.WMS.Entitys.Entitys.Mes;
using HH.WMS.Entitys.External;
using Newtonsoft.Json;
using System;
@@ -1513,18 +1515,20 @@
string tno = executeStatePara.transportTask.CN_S_TASK_NO;
if (tno.IndexOf('_') > 0)
{
- string TopNo = tno.Substring(0, tno.IndexOf("_"));
- string navNo = tno.Substring(tno.IndexOf("_") + 1);
- if (navNo == "2")
- {
- tno = TopNo;
- }
+ tno = tno.Substring(tno.IndexOf("_") + 1);
}
// 鑾峰彇涓讳换鍔� var task = BLLCreator.CreateDapper<TN_WM_TASKEntity>().GetSingleEntity(new
{
CN_S_TASK_NO = tno
});
+ Log.Detail(logPara, "鑾峰彇涓讳换鍔★細浠诲姟缂栧彿锛�" + tno);
+ // mes浠诲姟
+ var mes_task = BLLCreator.CreateDapper<TN_MES_TASK>().GetSingleEntity(new
+ {
+ task_no = task.CN_S_EXT1
+ });
+ Log.Detail(logPara, "鑾峰彇MES浠诲姟锛氫换鍔＄紪鍙凤細 " + task.CN_S_EXT1);
return UseTransaction(trans =>
{
@@ -1539,29 +1543,40 @@
}, new { executeStatePara.transportTask.CN_S_TASK_NO }, trans);
Log.Detail(logPara, "鏇存柊浠诲姟鐘舵�-浠诲姟鍙凤細" + executeStatePara.transportTask.CN_S_TASK_NO + "鐘舵�涓猴細" + executeStatePara.taskState);
- //绔嬪簱浠诲姟 瀛愪换鍔″畬鎴愭椂锛岄渶瑕佸悓姝ュ鐞嗕富浠诲姟
string taskNo = executeStatePara.transportTask.CN_S_TASK_NO;
+
+ //绔嬪簱浠诲姟 瀛愪换鍔″畬鎴愭椂锛岄渶瑕佸悓姝ュ鐞嗕富浠诲姟
if (taskNo.IndexOf('_') > 0)
{
- string fatherNo = taskNo.Substring(0, taskNo.IndexOf("_"));
- string hzNo = taskNo.Substring(taskNo.IndexOf("_") + 1);
+ string topNo = taskNo.Substring(0, taskNo.IndexOf("_"));
+ string navNo = taskNo.Substring(taskNo.IndexOf("_") + 1);
+
//A鍒癇鐨凙GV鎼繍浠诲姟
- if (hzNo == "1")
+ if (navNo == "1")
{
- //涓讳换鍔＄姸鎬佹洿鏀逛负:瀹屾垚涓�崐
- CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
+ if (mes_task.SECTION == TaskSectionConstants.BCP_KTCK ||
+ mes_task.SECTION == TaskSectionConstants.CXJ_MTCK ||
+ mes_task.SECTION == TaskSectionConstants.DS_MTCK)
{
- CN_S_MODIFY = "",
- CN_S_MODIFY_BY = "",
- CN_T_END = DateTime.Now,
- CN_T_MODIFY = DateTime.Now,
- CN_S_STATE = Constants.TaskState_CompleteHalf
- }, new { CN_S_TASK_NO = fatherNo }, trans);
- Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + fatherNo + "鐘舵�涓猴細" + Constants.TaskState_CompleteHalf);
+
+ }
+ else
+ {
+ //涓讳换鍔＄姸鎬佹洿鏀逛负:瀹屾垚涓�崐
+ CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
+ {
+ CN_S_MODIFY = "",
+ CN_S_MODIFY_BY = "",
+ CN_T_END = DateTime.Now,
+ CN_T_MODIFY = DateTime.Now,
+ CN_S_STATE = Constants.TaskState_CompleteHalf
+ }, new { CN_S_TASK_NO = topNo }, trans);
+ Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + topNo + "鐘舵�涓猴細" + Constants.TaskState_CompleteHalf);
+ }
}
//B鍒癈鐨勭珛搴撴惉杩愪换鍔�- if (hzNo == "2")
+ if (navNo == "2")
{
//涓讳换鍔＄姸鎬佹洿鏀逛负:瀹屾垚
CreateDAL<DapperDAL<TN_WM_TASKEntity>>().Update(new
@@ -1571,50 +1586,17 @@
CN_T_END = DateTime.Now,
CN_T_MODIFY = DateTime.Now,
CN_S_STATE = Constants.TaskState_Complete
- }, new { CN_S_TASK_NO = fatherNo }, trans);
- Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + fatherNo + "鐘舵�涓猴細" + Constants.TaskState_Complete);
+ }, new { CN_S_TASK_NO = topNo }, trans);
+ Log.Detail(logPara, "鏇存柊涓讳换鍔＄姸鎬�浠诲姟鍙凤細" + topNo + "鐘舵�涓猴細" + Constants.TaskState_Complete);
-
- if (task != null)
+ // mes浠诲姟杩涘叆涓嬩竴闃舵
+ CreateDAL<DapperDAL<TN_MES_TASK>>().Update(new
{
- // 鎺ラ┏浣嶇姸鎬佹敼涓�姝ｅ父
- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Normal
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_CONNECT_BIT
- }, trans);
-
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊鎺ラ┏浣嶇姸鎬�璐т綅鍙凤細" + task.CN_S_CONNECT_BIT + "鐘舵�涓猴細" + Constants.Location_State_Normal);
-
- if (task.CN_S_TASK_TYPE == Constants.In)
- {
- // 鍏ュ簱瀹屾垚缁堢偣璐т綅鐘舵�鏀逛负:婊�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Full
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_END_BIT
- }, trans);
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊缁堢偣绔嬪簱璐т綅鐘舵�-璐т綅鍙凤細" + task.CN_S_END_BIT + "鐘舵�涓猴細" + Constants.Location_State_Full);
- }
- else if (task.CN_S_TASK_TYPE == Constants.Out)
- {
- // 鍑哄簱瀹屾垚璧风偣璐т綅鐘舵�鏀逛负:绌�- CreateDapperDAL<TN_WM_LOCATION_EXTEntity>().Update(new
- {
- CN_S_LOCATION_STATE = Constants.Location_State_Empty
- }, new
- {
- CN_S_LOCATION_CODE = task.CN_S_START_BIT
- }, trans);
- Log.Detail(logPara, "涓讳换鍔″畬鎴愶紝鏇存柊璧风偣绔嬪簱璐т綅鐘舵�-璐т綅鍙凤細" + task.CN_S_START_BIT + "鐘舵�涓猴細" + Constants.Location_State_Empty);
- }
- }
+ NeedTrig = Constants.Y
+ }, new { task_no = mes_task.task_no }, trans);
}
}
+
if (executeStatePara.transportTask.CN_S_TASK_TYPE == null)
executeStatePara.transportTask.CN_S_TASK_TYPE = "";
@@ -2754,5 +2736,44 @@
}
}
+
+ /// <summary>
+ /// 鎺ユ敹浠诲姟
+ /// </summary>
+ /// <param name="receuveTask"></param>
+ /// <returns></returns>
+ public OperateResult ReceiveTask(ZCReceiveTaskEntity receuveTask)
+ {
+ TN_MES_TASK req = new TN_MES_TASK()
+ {
+ task_no = receuveTask.task_no,
+ Task_type = receuveTask.Task_type,
+ TurnCardNum = receuveTask.TurnCardNum,
+ PROD_NO = receuveTask.PROD_NO,
+ PROD_TECH = receuveTask.PROD_TECH,
+ PROD_SPEC = receuveTask.PROD_SPEC,
+ PROD_BOM = receuveTask.PROD_BOM,
+ PROD_Feature = receuveTask.PROD_Feature,
+ TOOLS_NO = receuveTask.TOOLS_NO,
+ ST_AMOUNT = receuveTask.ST_AMOUNT,
+ CURRENT_AMOUNT = receuveTask.CURRENT_AMOUNT,
+ Location_From = receuveTask.Location_From,
+ Location_To = receuveTask.Location_To,
+ PRODUCE_TIME = receuveTask.PRODUCE_TIME,
+ SHELF_LIFE_TIME = receuveTask.SHELF_LIFE_TIME,
+ EXPIRED_TIME = receuveTask.EXPIRED_TIME,
+ SHELF_REP = receuveTask.SHELF_REP,
+ EXPIRED_REP = receuveTask.EXPIRED_REP,
+ CHECK_CODE = receuveTask.CHECK_CODE,
+ CHECK_INFO = receuveTask.CHECK_INFO,
+ Priority = receuveTask.Priority,
+ Data_status = receuveTask.Data_status,
+ NeedTrig = "Y",
+ CreateDate = DateTime.Now,
+ BUSI_TYPE = receuveTask.BUSI_TYPE
+ };
+
+ return BLLCreator.Create<ZCBLL>().SaveTask(req);
+ }
}
}
--
Gitblit v1.9.1