testupdatefix bugsupdate
This commit is contained in:
parent
d757ceb3e6
commit
27b864ee77
|
|
@ -109,3 +109,4 @@ epick/obj/
|
|||
/WindowsServiceOut/obj/x86/Release
|
||||
/WindowsServiceOut/publish
|
||||
/winform/lng/zh-Hans
|
||||
*.rar
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -25,7 +25,7 @@ androidgeneratejnimarshalmethods=false
|
|||
os=windows_nt
|
||||
androidincludedebugsymbols=false
|
||||
androidpackagenamingpolicy=lowercasecrc64
|
||||
_nugetassetstimestamp=637939215822520618
|
||||
_nugetassetstimestamp=638428470221573048
|
||||
typemapkind=mvid
|
||||
androidsupportedabis=armeabi-v7a
|
||||
arm64-v8a
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -178,7 +178,7 @@ namespace DeiNiu.Data.BaseObject
|
|||
public int getNextSeq(enumCreateOrderType orderType)
|
||||
{
|
||||
string seq = "seq" + Utils.Util.getPrefix(orderType);
|
||||
LogHelper.debug(GetType(), " seq name is " + seq);
|
||||
// LogHelper.debug(GetType(), " seq name is " + seq);
|
||||
return model_imp.getSequence("seq" + Utils.Util.getPrefix(orderType) );
|
||||
}
|
||||
public int getNextSeq(string seqName)
|
||||
|
|
|
|||
|
|
@ -187,6 +187,12 @@ namespace DeiNiu.wms.Data.Model
|
|||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@venderId", mObj.CmdParameters[0]);
|
||||
break;
|
||||
case 640: //get detail by orderno
|
||||
|
||||
_strSql = "SELECT * FROM v_purch_valid_log WHERE pur_order = @pur_order";
|
||||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@pur_order", mObj.CmdParameters[0]);
|
||||
break;
|
||||
case 700: //get requst in order
|
||||
|
||||
_strSql = "SELECT * FROM v_stockInRequest WHERE orderNo = @orderNo";
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
case 900: //取最新的装车订单
|
||||
_strSql = "select * from [v_tmsPickRequest] t where exists(" +
|
||||
" select 1 from (SELECT top 1 * FROM [t_tmsTranRequest] where viechleNo = '001' order by createtime desc) a where a.transNo = t.transNo " +
|
||||
" select 1 from (SELECT top 1 * FROM [t_tmsTranRequest] where viechleNo = @plateid order by createtime desc) a where a.transNo = t.transNo " +
|
||||
") order by lineorder ";
|
||||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
{
|
||||
case 99: //query with dic
|
||||
|
||||
if (1==1 || mObj.CmdParameters[0].ToString().Contains("saleOrder ="))
|
||||
if (/*1==1 ||*/ mObj.CmdParameters[0].ToString().Contains("saleOrder ="))
|
||||
{
|
||||
_strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo FROM [v_stockOutBatchPickDetailWithSaleOrder] WHERE 1 = 1 " + mObj.CmdParameters[0].ToString();
|
||||
_strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY pickpriority ,channel,shelf,layer";
|
||||
|
|
@ -432,7 +432,8 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
if (Convert.ToBoolean(mObj.CmdParameters[8]))
|
||||
{
|
||||
_strSql += " order by priority desc,seedspickno desc, goodsid";
|
||||
// _strSql += " order by priority desc,seedspickno desc, goodsid";
|
||||
_strSql += " order by priority desc, goodsid";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -441,9 +442,9 @@ namespace DeiNiu.wms.Data.Model
|
|||
}
|
||||
|
||||
|
||||
LogHelper.debug(GetType(), _strSql);
|
||||
// LogHelper.debug(GetType(), _strSql);
|
||||
|
||||
sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.MAX_JOBS_IN_A_WAVE);
|
||||
sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.MAX_JOBS_IN_A_WAVE*5);
|
||||
sqlCmd.CommandText = _strSql;
|
||||
|
||||
break;
|
||||
|
|
@ -530,7 +531,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
}
|
||||
|
||||
|
||||
LogHelper.debug(GetType(), _strSql);
|
||||
// LogHelper.debug(GetType(), _strSql);
|
||||
|
||||
sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[10]);
|
||||
// _strSql += " order by priority desc,customerid,locationid";
|
||||
|
|
|
|||
|
|
@ -264,6 +264,21 @@ namespace DeiNiu.wms.Data.Model
|
|||
sqlCmd.Parameters.AddWithValue("@stateOld", mObj.CmdParameters[2]);
|
||||
sqlCmd.Parameters.AddWithValue("@operId", mObj.CmdParameters[3]);
|
||||
break;
|
||||
|
||||
case 1212: // update order status with pickorderno and new status
|
||||
|
||||
_strSql = " update t_wmsOutRequest set state =@state "
|
||||
+ ",operater =@operId,lastmodified = getdate() "
|
||||
+ " where pickOrderNo =@pickOrderNo ";
|
||||
|
||||
sqlCmd.CommandText = _strSql;
|
||||
|
||||
sqlCmd.Parameters.AddWithValue("@pickOrderNo", mObj.CmdParameters[0]);
|
||||
sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[1]);
|
||||
sqlCmd.Parameters.AddWithValue("@operId", mObj.CmdParameters[2]);
|
||||
break;
|
||||
|
||||
|
||||
case 1300: //prepare the out request orders for pick
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -255,6 +255,15 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
break;
|
||||
|
||||
case 1700:
|
||||
_strSql = " select * from [t_wmsStockPandian] where status > @statusStart and status< @statusEnd ";
|
||||
sqlCmd.Parameters.AddWithValue("@statusStart", (int) enumPandianStatus.未开始);
|
||||
sqlCmd.Parameters.AddWithValue("@statusEnd", (int)enumPandianStatus.盘点结束);
|
||||
sqlCmd.CommandText = _strSql;
|
||||
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,6 +118,17 @@ namespace DeiNiu.wms.Data.Model
|
|||
return CustQuery(600).Tables[0];
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据计划单号，验收记录
|
||||
/// </summary>
|
||||
/// <param name="orderNo"></param>
|
||||
/// <returns></returns>
|
||||
public DataTable getReceiveMuiltiHistory(string orderNo)
|
||||
{
|
||||
cmdParameters[0] = orderNo;
|
||||
return CustQuery(640).Tables[0];
|
||||
}
|
||||
|
||||
public DataTable getReceivePreSumByVender(string venderId)
|
||||
{
|
||||
cmdParameters[0] = venderId;
|
||||
|
|
|
|||
|
|
@ -128,6 +128,8 @@ namespace DeiNiu.wms.Data.Model
|
|||
foreach (DataRow dr in dt.Rows)
|
||||
{
|
||||
wor = new WmsOutRequest(dr);
|
||||
|
||||
|
||||
saleOrders +="'"+ wor.orderNo + "',";
|
||||
}
|
||||
LogHelper.debug(typeof(Erp_sale), " try updatePickStatus , saleOrders: " + saleOrders);
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
public bool isZhitong
|
||||
{
|
||||
get { return _canZhitong || !String.IsNullOrEmpty(_isZhitong) &&_isZhitong.Equals("1"); }
|
||||
get { return /*_canZhitong || */!String.IsNullOrEmpty(_isZhitong) &&_isZhitong.Equals("1"); }
|
||||
}
|
||||
public bool isZhitongFromStore
|
||||
{
|
||||
|
|
|
|||
|
|
@ -276,6 +276,16 @@ namespace DeiNiu.wms.Data.Model
|
|||
cmdParameters[3] = operater;
|
||||
CustOper(1211);
|
||||
}
|
||||
|
||||
public void updatePickState(string pickOrderNo, Utils.enumOutStockRequestStatus stateNew)
|
||||
{
|
||||
|
||||
cmdParameters[0] = pickOrderNo;
|
||||
cmdParameters[1] = (int)stateNew;
|
||||
cmdParameters[2] = operater;
|
||||
CustOper(1212);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// prepare the out request orders for pick
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -205,7 +205,13 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
foreach (string p in subPlate)
|
||||
{
|
||||
LogHelper.debug(this.GetType(), string.Format("2 subplate size {2}, plateId {0},sub plate id {1}", plateId, p, subPlate.Count));
|
||||
// dts.Concat(getPlateJobsDts(dts,obj.plateId, showSub));
|
||||
if (p.Equals(plateId))
|
||||
{
|
||||
|
||||
continue;
|
||||
}
|
||||
dts=(getPlateJobsDts(dts, p, showSub));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -187,11 +187,11 @@ namespace DeiNiu.wms.Data.Model
|
|||
return custId;
|
||||
}
|
||||
|
||||
public DataTable getUnLoadTruckStks(string toPlate, int cnt)
|
||||
public DataTable getUnLoadTruckStks(string transNo, int cnt)
|
||||
{
|
||||
WmsPlate toP = new WmsPlate(toPlate);
|
||||
|
||||
cmdParameters[0] = toP.transNo;
|
||||
|
||||
cmdParameters[0] = transNo;
|
||||
cmdParameters[1] = cnt;
|
||||
|
||||
return CustQuery(1300).Tables[0];
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ public WmsStock( string locationId)
|
|||
&& count - countOut == 0 //架上库存
|
||||
&& adjustingCnt == 0
|
||||
&& countOuting == 0
|
||||
&& plateCount == 0
|
||||
&& plateCount <= 0
|
||||
&& virtialCount == 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
wor.operater = operater;
|
||||
wor.requestBy = operater;
|
||||
wor.approvedBy = operater;
|
||||
wor.approveDate = wor.getDateTime();
|
||||
wor.description = String.Format("盘点单号：{0}, 类型：{1},结束时间:{2}, 过滤条件：{3}", orderNo, ((enumPandianType)type).ToString(), endTime, condition);
|
||||
|
||||
wor.Add();
|
||||
|
|
@ -250,6 +251,20 @@ namespace DeiNiu.wms.Data.Model
|
|||
cmdParameters[0] = part;
|
||||
return CustQuery(1600).Tables[0];
|
||||
}
|
||||
|
||||
public string getCurrentPandian()
|
||||
{
|
||||
|
||||
DataTable dt = CustQuery(1700).Tables[0];
|
||||
|
||||
foreach(DataRow dr in dt.Rows)
|
||||
{
|
||||
return dr["orderNo"].ToString();
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +117,9 @@ namespace DeiNiu.wms.Data.Model
|
|||
}
|
||||
else
|
||||
{
|
||||
throw new Exception( string .Format("没有库位，请创建库位,库位类型 {0}, part {1}, abc {abc} ", volType.ToString(),part,abc));
|
||||
// throw new Exception( string .Format("没有库位，请创建库位,库位类型 {0}, part {1}, abc {2} ", volType.ToString(),part,abc));
|
||||
|
||||
return new WmsLocation("11.01.01.11");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -156,6 +158,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
LogHelper.debug(this.GetType(), "0 to free location in stock , whLocVol? " + whLocVol);
|
||||
freeLocations();
|
||||
string error = string.Format("空货位不足，需要{0}个，找到{1}个。", count, locations.Count);
|
||||
|
||||
// throw new DeiNiuNoFreeLocationkException(error);
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -645,7 +645,7 @@ namespace DeiNiu.Utils
|
|||
|
||||
string orderno = string.Format("{0}{1:D2}{2:D2}{6}{3:D2}{4}{5:D6}", prefix, DateTime.Now.Year - 2000,
|
||||
DateTime.Now.Month, DateTime.Now.Day, GenerateRandomNumber(2), seq, GenerateRandomNumber(1));
|
||||
LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}", seq,orderno));
|
||||
//LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}", seq,orderno));
|
||||
return orderno;
|
||||
}
|
||||
public static enumStockRecordType getStockRecordType(int outStoretype)
|
||||
|
|
|
|||
|
|
@ -126,6 +126,9 @@
|
|||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="ThoughtWorks.QRCode.dll" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -370,8 +370,8 @@ namespace DeiNiu.Utils
|
|||
|
||||
public static bool PDA_LOC_GOODTYPE_VALIDATION=true;
|
||||
public static bool NO_FREE_LOCATION_USE_TMP=true;
|
||||
public static string TMP_BULK_LOCATION="零库临时货位";
|
||||
public static string TMP_BATCH_LOCATION = "整库临时货位";
|
||||
public static string TMP_BULK_LOCATION="11.01.01.11";
|
||||
public static string TMP_BATCH_LOCATION = "11.01.01.11";
|
||||
public static string TMP_LACK_DEBIT_LOCATION = "缺货虚拟货位";//拣货时系统库存不足，但未进系统的待入货物从此周转，借用
|
||||
public static bool BOX_BULK_IN_SINGLE_LOC=true; //拆箱入零库，一箱上单个货位，减少分拆上货花费成本。
|
||||
public static bool VALID_LOC_CAPICITY = false;//是否验证货位库容
|
||||
|
|
@ -420,10 +420,10 @@ namespace DeiNiu.Utils
|
|||
public static int TEST_VALID_IN_ITEM_CNT=500;
|
||||
public static int TEST_PICK_OUT_ITEM_CNT = 500;
|
||||
public static int MAX_JOBS_IN_A_WAVE = 100; //生成出货波次任务时，单个波次包含的最大任务数
|
||||
public static string PDA_MENU_UTILS="Utils";
|
||||
public static string PDA_MENU_STK_OUT="Stk In";
|
||||
public static string PDA_MENU_STK_IN=" Stk out";
|
||||
public static string PDA_MENU_PLATE="Plate relate";
|
||||
public static string PDA_MENU_UTILS= "库管工具";
|
||||
public static string PDA_MENU_STK_OUT= "入库收货";
|
||||
public static string PDA_MENU_STK_IN= "出库拣货";
|
||||
public static string PDA_MENU_PLATE= "集货管理";
|
||||
|
||||
public static int ERP_TRANS_DATA_AT_CLOCK;
|
||||
public static int ERP_TRANS_DATA_SLEEP_MINUES;
|
||||
|
|
@ -460,13 +460,7 @@ namespace DeiNiu.Utils
|
|||
public static int SEEDS_TASK_FETCH_END_HOUR = 14;
|
||||
public static int SEEDS_TASK_FETCH_START_MINUTES = 20;
|
||||
public static int SEEDS_TASK_FETCH_END_MINUTES = 35;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static string CURRENT_PANDIAN_ORDER="";
|
||||
public static bool ERP_NOTICE_STOCK_OUT_DOING;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1540,6 +1540,8 @@ namespace DeiNiu.Wcf
|
|||
try
|
||||
{
|
||||
enumRepResult result = lport.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId,isForceClose);
|
||||
|
||||
|
||||
return new FormatedResult(result.ToString());
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -1550,6 +1552,31 @@ namespace DeiNiu.Wcf
|
|||
|
||||
}
|
||||
|
||||
FormatedResult IAndroid.seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt,
|
||||
string toFlowNo, int inDetailId, bool isForceClose)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
decimal seeded = new WmsOutPickDetail(outDetailId).seeded;
|
||||
|
||||
enumRepResult rs = lport.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
|
||||
|
||||
seeded = new WmsOutPickDetail(outDetailId).seeded - seeded;
|
||||
|
||||
|
||||
return new FormatedResult(rs.ToString(),0,seeded+"");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
log.Error(e);
|
||||
return new FormatedResult(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public FormatedResult upValidImage(string preNo, string goodsId, Stream fileContent)
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3054,6 +3054,11 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
return erpPurchObj.getReceiveHistory(purOrderNo);
|
||||
}
|
||||
internal DataTable getReceiveMuiltiHistory(string purOrderNo)
|
||||
{
|
||||
return erpPurchObj.getReceiveMuiltiHistory(purOrderNo);
|
||||
}
|
||||
|
||||
|
||||
internal int newShipInfo(structShip ship)
|
||||
{
|
||||
|
|
@ -3919,6 +3924,7 @@ namespace DeiNiu.wms.Logical
|
|||
erd.validbyTime = erd.getDateTime();
|
||||
erd.validbyTime1 = erd.validbyTime;
|
||||
erd.price =svi.price;
|
||||
erd.receive_order = svi.receive_order;
|
||||
erd.Add();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -193,12 +193,13 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
|
||||
DataTable dt = getWmsOutPickPort.getNewPickTasks(new WaveRule().getCurrentActiveRule(enumWaveRuleType.普通波次));
|
||||
logOut.Debug("start to process new waves...count:" + dt.Rows.Count);
|
||||
|
||||
if (dt.Rows.Count == 0)
|
||||
{
|
||||
|
||||
return false;
|
||||
}
|
||||
logTest.Debug("start to process new waves...count:" + dt.Rows.Count);
|
||||
int lastTranArea = -100, lastPartion = -100, lastVolType = -100, lastOrderType = -100;//,lastChannel=-100;
|
||||
string lastPickRequest = "", waveNo = "", jobNo = "",lastWaveNo="";
|
||||
bool isNewWave = false, isNewJob = false;
|
||||
|
|
@ -397,7 +398,7 @@ namespace DeiNiu.wms.Logical
|
|||
scope.Complete();
|
||||
}
|
||||
|
||||
logOut.Debug("end process new waves.. in last wave, created job count " +jobcnt);
|
||||
logTest.Debug("end process new waves.. in last wave, created job count " +jobcnt);
|
||||
|
||||
|
||||
|
||||
|
|
@ -1112,6 +1113,7 @@ namespace DeiNiu.wms.Logical
|
|||
bool batchOnly = false;
|
||||
string orderNo="";
|
||||
bool isWeightSeeds = false;
|
||||
bool isWeightSeedsLitmited= false; //接受最大量约束
|
||||
|
||||
if (!string.IsNullOrEmpty(lastJobNo))
|
||||
{
|
||||
|
|
@ -1146,10 +1148,14 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
isWeightSeeds = loc.isWeightSeeds
|
||||
|| loc.part == 16759 //蔬菜类，边拣边分，获取单品所有任务，不跨区分配
|
||||
|| loc.part == 16761 //冷冻
|
||||
|| loc.part == 16762; //冷冻
|
||||
// || loc.part == 16761 //冷冻
|
||||
// || loc.part == 16762
|
||||
; //冷冻
|
||||
|
||||
logOut.Debug("蔬菜类 is weight seeds ? " + isWeightSeeds);
|
||||
isWeightSeedsLitmited = loc.part == 16761 || loc.part == 16762; //冷冻
|
||||
|
||||
|
||||
// logOut.Debug("蔬菜类 is weight seeds ? " + isWeightSeeds);
|
||||
|
||||
|
||||
if (!isWeightSeeds && isJobMax(operId, partion, lineId, 0, 0, batchOnly, orderType))
|
||||
|
|
@ -1160,7 +1166,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
warehouse = warehouse == 0 ? loc.warehouse : warehouse;
|
||||
|
||||
logOut.Debug(string.Format("partion {0}, lineId {1}, batchOnly {2}, orderType {3}, taskBelongTo {4},warehouse {5}, orderNo {6},lastJobNo {7},isWeightSeeds {8} ", partion, lineId, batchOnly, orderType, taskBelongTo, warehouse, orderNo, lastJobNo, isWeightSeeds));
|
||||
logOut.Debug(string.Format("partion {0}, lineId {1}, batchOnly {2}, orderType {3}, taskBelongTo {4},warehouse {5}, orderNo {6},lastJobNo {7},isWeightSeeds {8}，isWeightSeedsLitmited {9} ", partion, lineId, batchOnly, orderType, taskBelongTo, warehouse, orderNo, lastJobNo, isWeightSeeds, isWeightSeedsLitmited));
|
||||
|
||||
|
||||
|
||||
|
|
@ -1175,11 +1181,10 @@ namespace DeiNiu.wms.Logical
|
|||
&& DateTime.Now.Hour <= WmsConstants.SEEDS_TASK_FETCH_END_HOUR ) &&
|
||||
( DateTime.Now.Minute >= WmsConstants.SEEDS_TASK_FETCH_START_MINUTES && DateTime.Now.Minute <= WmsConstants.SEEDS_TASK_FETCH_END_MINUTES);
|
||||
|
||||
logOut.Debug(string.Format("当前小时 {0}， 分{1}" ,DateTime.Now.Hour, DateTime.Now.Minute));
|
||||
// logOut.Debug(string.Format("当前小时 {0}， 分{1}" ,DateTime.Now.Hour, DateTime.Now.Minute));
|
||||
|
||||
|
||||
logOut.Debug(string.Format("任务分配开始时间{0}:{1},结束时间{2}:{3}, 可以抢拣货任务？ {4}",
|
||||
WmsConstants.SEEDS_TASK_FETCH_START_HOUR, WmsConstants.SEEDS_TASK_FETCH_START_MINUTES, WmsConstants.SEEDS_TASK_FETCH_END_HOUR, WmsConstants.SEEDS_TASK_FETCH_END_MINUTES, isTimeForFetchTasks));
|
||||
// logOut.Debug(string.Format("任务分配开始时间{0}:{1},结束时间{2}:{3}, 可以抢拣货任务？ {4}", WmsConstants.SEEDS_TASK_FETCH_START_HOUR, WmsConstants.SEEDS_TASK_FETCH_START_MINUTES, WmsConstants.SEEDS_TASK_FETCH_END_HOUR, WmsConstants.SEEDS_TASK_FETCH_END_MINUTES, isTimeForFetchTasks));
|
||||
|
||||
if (!isTimeForFetchTasks)
|
||||
{
|
||||
|
|
@ -1188,10 +1193,10 @@ namespace DeiNiu.wms.Logical
|
|||
//return jobs;
|
||||
}
|
||||
|
||||
if (isWeightSeeds)
|
||||
if (isWeightSeeds || isWeightSeedsLitmited)
|
||||
{
|
||||
|
||||
dtFreeTasks = getWmsOutPickPort.getFreeTasksByJob(partion, lineId, batchOnly, orderType, taskBelongTo, warehouse, "", "", isWeightSeeds);
|
||||
dtFreeTasks = getWmsOutPickPort.getFreeTasksByJob(partion, lineId, batchOnly, orderType, taskBelongTo, warehouse, "", "", true);
|
||||
|
||||
}
|
||||
else
|
||||
|
|
@ -1239,7 +1244,7 @@ namespace DeiNiu.wms.Logical
|
|||
WmsOutPickPort wop;
|
||||
|
||||
|
||||
if (isWeightSeeds)
|
||||
if (isWeightSeeds || isWeightSeedsLitmited)
|
||||
{
|
||||
|
||||
|
||||
|
|
@ -1257,7 +1262,7 @@ namespace DeiNiu.wms.Logical
|
|||
wop.takeBy = operId;
|
||||
|
||||
wop.Update();
|
||||
log.Debug(" user " + operId + " task Assign :" + wop.ID);
|
||||
logOut.Debug(" user " + operId + " task Assign :" + wop.ID);
|
||||
|
||||
if (lastJob != wop.jobNo)
|
||||
{
|
||||
|
|
@ -1266,26 +1271,32 @@ namespace DeiNiu.wms.Logical
|
|||
wf.owner = operId;
|
||||
wf.state = (int)enumFlowTaskStatus.进行中;
|
||||
wf.Update();
|
||||
log.Debug(" user " + operId + " flow Assign :" + wf.task);
|
||||
// logOut.Debug(" user " + operId + " flow Assign :" + wf.task);
|
||||
}
|
||||
|
||||
|
||||
taskCnt++;
|
||||
|
||||
if (taskCnt > 20)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
if (isWeightSeedsLitmited)
|
||||
{
|
||||
lotcnt++;
|
||||
boxcnt += Convert.ToInt32(drv["boxcnt"].ToString());
|
||||
|
||||
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
|
||||
{
|
||||
logTest.Debug(string.Format(" All tasks to do , loc cnt :{0}, box cnt: {1}", lotcnt, boxcnt));
|
||||
logOut.Debug(string.Format("1 can't assign more tasks , loc cnt :{0}, box cnt: {1}, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100: {2}", lotcnt, boxcnt, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100));
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (taskCnt > 20)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
|
|
@ -1298,10 +1309,13 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
|
||||
dv.RowFilter = "recType <>" + (int)enumStockRecordType.集货拣货;
|
||||
dv.Sort = "priority desc,goodsId";
|
||||
|
||||
// dv.Sort = "priority desc,goodsId";
|
||||
dv.Sort = "goodsId";
|
||||
string lastGoods = "";
|
||||
|
||||
logOut.Debug(string.Format(" tasks count for assisgn {0}", dv.Count));
|
||||
|
||||
|
||||
foreach (DataRowView drv in dv)
|
||||
{
|
||||
|
||||
|
|
@ -1309,10 +1323,13 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
if (string.IsNullOrEmpty(lastGoods))
|
||||
{
|
||||
lastGoods = drv["goodsId"].ToString(); ;
|
||||
lastGoods = drv["goodsId"].ToString();
|
||||
logOut.Debug(string.Format(" current goods {0} {1} " , lastGoods, drv["goodsname"].ToString()));
|
||||
|
||||
}
|
||||
else if (lastGoods != drv["goodsId"].ToString())
|
||||
{
|
||||
logOut.Debug(string.Format(" next goods {0}.....break... ", drv["goodsname"].ToString()));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1325,7 +1342,10 @@ namespace DeiNiu.wms.Logical
|
|||
wop.takeBy = operId;
|
||||
|
||||
wop.Update();
|
||||
log.Debug(" user " + operId + " task Assign :" + wop.ID);
|
||||
|
||||
taskCnt++;
|
||||
|
||||
logOut.Debug(string.Format("user id {0} , task assign ID {1}, toatal task cnt {2}", operId,wop.ID,taskCnt));
|
||||
|
||||
if (lastJob != wop.jobNo)
|
||||
{
|
||||
|
|
@ -1334,19 +1354,9 @@ namespace DeiNiu.wms.Logical
|
|||
wf.owner = operId;
|
||||
wf.state = (int)enumFlowTaskStatus.进行中;
|
||||
wf.Update();
|
||||
log.Debug(" user " + operId + " flow Assign :" + wf.task);
|
||||
// logOut.Debug(" user " + operId + " flow Assign :" + wf.task);
|
||||
}
|
||||
|
||||
/*
|
||||
lotcnt++;
|
||||
boxcnt += Convert.ToInt32(drv["boxcnt"].ToString());
|
||||
|
||||
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
|
||||
{
|
||||
logTest.Debug(string.Format(" All tasks to do , loc cnt :{0}, box cnt: {1}", lotcnt, boxcnt));
|
||||
break;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1396,7 +1406,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
|
||||
{
|
||||
logOut.Debug(string.Format(" All tasks to do , loc cnt :{0}, box cnt: {1}", lotcnt, boxcnt));
|
||||
logOut.Debug(string.Format("2 can't assign more tasks , loc cnt :{0}, box cnt: {1}, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100: {2}", lotcnt, boxcnt, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1407,6 +1417,27 @@ namespace DeiNiu.wms.Logical
|
|||
return jobs;
|
||||
}
|
||||
|
||||
internal decimal seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId,
|
||||
decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose)
|
||||
|
||||
{
|
||||
decimal seeded = new WmsOutPickDetail(outDetailId).seeded;
|
||||
|
||||
enumRepResult rs = seedsPickOut(flowNo,skuId,productDate,batch,outDetailId,seedCnt,toFlowNo,inDetailId,isForceClose);
|
||||
|
||||
|
||||
if (rs == enumRepResult.成功)
|
||||
{
|
||||
return new WmsOutPickDetail(outDetailId).seeded - seeded;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 取总播种操作
|
||||
/// </summary>
|
||||
|
|
@ -1450,7 +1481,7 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
// WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo+wod.goodsId+batch, flowNo);
|
||||
WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo, flowNo);
|
||||
logTest.Debug(string.Format("orderNo {0}, flowNo {1}, wmsflow {2}", wod.seedsPickNo + wod.goodsId + batch, flowNo, wmsflow.ToString()));
|
||||
// logTest.Debug(string.Format("orderNo {0}, flowNo {1}, wmsflow {2}", wod.seedsPickNo + wod.goodsId + batch, flowNo, wmsflow.ToString()));
|
||||
|
||||
enumRepResult rs= wmsflow.checkFlow(operId, wmsflow.type);
|
||||
if (rs!=enumRepResult.成功)
|
||||
|
|
@ -1462,9 +1493,16 @@ namespace DeiNiu.wms.Logical
|
|||
//to check the toFlowNo plate
|
||||
|
||||
|
||||
string custId = "";
|
||||
|
||||
|
||||
WmsPlate toP = new WmsPlate(toFlowNo);
|
||||
string custId = toP.customerId;
|
||||
|
||||
// logTest.Debug("1 " + toP);
|
||||
|
||||
|
||||
if (String.IsNullOrEmpty(custId))
|
||||
{
|
||||
|
||||
if (toP.ID > 0)
|
||||
{
|
||||
|
|
@ -1473,24 +1511,37 @@ namespace DeiNiu.wms.Logical
|
|||
toP.partion = wod.goods.part;
|
||||
toP.customerId = wod.customerId;
|
||||
toP.Update();
|
||||
logTest.Debug("2 updated plate customerId " + wod.customerId);
|
||||
}
|
||||
|
||||
custId = toP.customerId;
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (String.IsNullOrEmpty(custId))
|
||||
else
|
||||
{
|
||||
|
||||
custId = new WmsPlateStock_tmp().getRelatedCustId(toFlowNo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//------》》》》 //TODO: to remove this block
|
||||
/*
|
||||
logTest.Debug("3 " + toP);
|
||||
|
||||
toP = new WmsPlate(toFlowNo); //TODO: to remove this line
|
||||
|
||||
logTest.Debug("31 new saved plate: " + toP); //TODO: to remove this line
|
||||
|
||||
logTest.Debug(" to flow "+ toFlowNo +" , exist customer id " + custId + ", wod customerId is " + wod.customerId);
|
||||
|
||||
if (toP.ID > 0)
|
||||
{
|
||||
custId = new WmsPlateStock_tmp().getRelatedCustId(toFlowNo);
|
||||
}
|
||||
*/
|
||||
//------<《《《《《
|
||||
|
||||
if (!string.IsNullOrEmpty(custId) && custId != wod.customerId)
|
||||
{
|
||||
return enumRepResult.容器已被其他客户占用;
|
||||
|
|
@ -1668,8 +1719,11 @@ namespace DeiNiu.wms.Logical
|
|||
wop.count = wod.count;
|
||||
int id = wop.Add();
|
||||
|
||||
|
||||
|
||||
/* /// 发车时从已分播到客户的容器里减去容器占用
|
||||
WmsStock stk1 = new WmsStock(wsr.locationId, wsr.skuId, wsr.goodsId);
|
||||
stk1.plateCount -= seedCnt;
|
||||
stk1.updateCountOut();
|
||||
*/
|
||||
|
||||
/*
|
||||
if(toPlate.customerId!=wod.customerId)
|
||||
|
|
@ -1705,6 +1759,8 @@ namespace DeiNiu.wms.Logical
|
|||
// log.Debug("3 tmp.count " + tmp.count);
|
||||
// log.Debug(tmpStk);
|
||||
|
||||
|
||||
|
||||
if (tmp.count == 0)
|
||||
{
|
||||
// log.Debug("deleted tmp stock, outPortId " + tmp.outPortId);
|
||||
|
|
@ -1758,6 +1814,8 @@ namespace DeiNiu.wms.Logical
|
|||
else //客户类型的容器，新增装车任务
|
||||
{
|
||||
stk.state = (int)enumPlateStatus.已集货;
|
||||
|
||||
|
||||
if (!WmsConstants.IS_PLATE_IN_LINE && string.IsNullOrEmpty(toP.customerId))
|
||||
{
|
||||
|
||||
|
|
@ -1784,6 +1842,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
toP.Update();
|
||||
|
||||
// logTest.Debug("4 " + toP);
|
||||
wmsflow.Add();
|
||||
}
|
||||
|
||||
|
|
@ -1797,7 +1856,7 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
try
|
||||
{
|
||||
string truck = "00" + wsr.locationId.Substring(0, 1);
|
||||
string truck = "000";// + wsr.locationId.Substring(0, 1);
|
||||
new lWmsPlate(operId).loadTruck(toFlowNo, truck);
|
||||
}
|
||||
catch (Exception er)
|
||||
|
|
@ -1960,7 +2019,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
}
|
||||
|
||||
logTest.Debug(" to flow " + toFlowNo + " , exist customer id " + custId + ", wod customerId is " + wod.customerId);
|
||||
// logTest.Debug(" to flow " + toFlowNo + " , exist customer id " + custId + ", wod customerId is " + wod.customerId);
|
||||
|
||||
if (!string.IsNullOrEmpty(custId) && custId != wod.customerId)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2148,7 +2148,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
List<WmsOutPickRequest> lst = outRequest.getRequestObjects(outType,status);
|
||||
|
||||
logOut.Debug(string.Format("begin createPDAPickTasks filter status {0}...count {1}................", status, lst.Count));
|
||||
// logOut.Debug(string.Format("begin createPDAPickTasks filter status {0}...count {1}................", status, lst.Count));
|
||||
|
||||
foreach (WmsOutPickRequest pr in lst)
|
||||
{
|
||||
|
|
@ -2161,7 +2161,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
List<WmsOutPickRequest> lst = outRequest.getRequestObjects(status);
|
||||
|
||||
logOut.Debug(string.Format("begin createPDAPickTasks filter status {0}...count {1}................", status, lst.Count));
|
||||
// logOut.Debug(string.Format("begin createPDAPickTasks filter status {0}...count {1}................", status, lst.Count));
|
||||
|
||||
foreach (WmsOutPickRequest pr in lst)
|
||||
{
|
||||
|
|
@ -3743,13 +3743,13 @@ namespace DeiNiu.wms.Logical
|
|||
plateStock.skuId = stk.skuId;
|
||||
plateStock.Add();
|
||||
|
||||
logOut.Debug(string.Format(" auto load truck? {0}, recType {1}, wopr.seedsPickNo {2}, wopr.pickorderNo {3}", WmsConstants.AUTO_LOAD_TRUCK, outPickPort.recType, wopr.seedsPickNo,wopr.pickOrderNo));
|
||||
// logOut.Debug(string.Format(" auto load truck? {0}, recType {1}, wopr.seedsPickNo {2}, wopr.pickorderNo {3}", WmsConstants.AUTO_LOAD_TRUCK, outPickPort.recType, wopr.seedsPickNo,wopr.pickOrderNo));
|
||||
|
||||
if (WmsConstants.AUTO_LOAD_TRUCK)
|
||||
{
|
||||
if (outPickPort.recType != (int)enumStockRecordType.集货拣货)
|
||||
{
|
||||
string truck = "00" + stk.locationId.Substring(0,1);
|
||||
string truck = "000"; //+ stk.locationId.Substring(0,1);
|
||||
new lWmsPlate(operId).loadTruck(plateStock.plateId, string.IsNullOrEmpty( wopr.seedsPickNo) ? wopr.pickOrderNo: truck);//有总拣任务的分拣单集中装车
|
||||
}
|
||||
|
||||
|
|
@ -4331,8 +4331,20 @@ namespace DeiNiu.wms.Logical
|
|||
es.fuhezt = true;
|
||||
es.Update();
|
||||
es.updatePickStatus(pickOrderNo, enumOutStockRequestStatus.复核完成);
|
||||
}else
|
||||
}
|
||||
else
|
||||
{
|
||||
es.updatePickStatus( pickOrderNo, state);
|
||||
try
|
||||
{
|
||||
new WmsOutRequest().updatePickState(pickOrderNo, state);
|
||||
}
|
||||
catch (Exception er)
|
||||
{
|
||||
log.Error(er);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -4449,6 +4461,8 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
internal DataTable getBoxsByPickOrder(string pickOrderNo)
|
||||
|
|
@ -5781,6 +5795,8 @@ namespace DeiNiu.wms.Logical
|
|||
req.Update();
|
||||
updateErpSaleStatus(req.pickOrderNo, enumOutStockRequestStatus.已出库);
|
||||
|
||||
|
||||
|
||||
scope.Complete();
|
||||
}
|
||||
log.Debug(string.Format(" request {0} 已出库 ,{1}", req.pickOrderNo, enumOutStockRequestStatus.已出库));
|
||||
|
|
@ -5809,6 +5825,9 @@ namespace DeiNiu.wms.Logical
|
|||
return "没有数据";
|
||||
}
|
||||
logERP.Debug( " erp sale order 待通知总共数量 " +dt.Rows.Count);
|
||||
|
||||
WmsConstants.ERP_NOTICE_STOCK_OUT_DOING = true;
|
||||
|
||||
int i = 0;
|
||||
foreach (DataRow dr in dt.Rows)
|
||||
{
|
||||
|
|
@ -5827,8 +5846,11 @@ namespace DeiNiu.wms.Logical
|
|||
Thread.Sleep(100);
|
||||
// break;
|
||||
}
|
||||
|
||||
logERP.Debug(" erp sale order 通知 结束------《");
|
||||
|
||||
WmsConstants.ERP_NOTICE_STOCK_OUT_DOING = false;
|
||||
|
||||
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ namespace DeiNiu.wms.Logical
|
|||
Dictionary<string, decimal> bulkCountRequest = new Dictionary<string, decimal>();
|
||||
Dictionary<string, decimal> bulkRepRequest = new Dictionary<string, decimal>();
|
||||
|
||||
logOut.Debug("start create pick out request------> status :" + status);
|
||||
logTest.Debug("start create pick out request------> status :" + status);
|
||||
|
||||
// outRequest.preparePick(); // only impact on out detail with skuId.
|
||||
|
||||
|
|
@ -442,8 +442,10 @@ namespace DeiNiu.wms.Logical
|
|||
int worCnt = 0;
|
||||
// string lastOrder = "";
|
||||
int maxOutRequestCnt = isMerge ? WmsConstants.PAGER_SIZE : 1;
|
||||
logOut.Debug(" request count to pick " + dt.Rows.Count);
|
||||
|
||||
if (dt.Rows.Count > 0)
|
||||
{
|
||||
logTest.Debug(" request count to pick " + dt.Rows.Count);
|
||||
}
|
||||
int i = 0;
|
||||
DataView dv = dt.DefaultView;
|
||||
dv.Sort = " priority,customerId,orderType";
|
||||
|
|
@ -483,7 +485,7 @@ namespace DeiNiu.wms.Logical
|
|||
if (cust.pickInterval > 0 &&
|
||||
outRequest.getByCustForPick(status, lastCustId).Rows.Count == 0)
|
||||
{
|
||||
logSpec.Debug("cust " + lastCustId + ", no exist out request to pick， to update last outtime. ");
|
||||
logTest.Debug("cust " + lastCustId + ", no exist out request to pick， to update last outtime. ");
|
||||
cust.lastOutTime = cust.getDateTime();
|
||||
cust.Update();
|
||||
}
|
||||
|
|
@ -547,7 +549,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
isProcessOutOrders = false;
|
||||
|
||||
logOut.Debug("end create pick out request---------------------------------------- <<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
||||
logTest.Debug("end create pick out request---------------------------------------- <<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -557,7 +559,7 @@ namespace DeiNiu.wms.Logical
|
|||
//取生成的所有拣货单，按pickgroup生成播种单，对摘果的零货生成补货单
|
||||
List<WmsOutPickRequest> all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位);
|
||||
bool isSeedsCreated = false;
|
||||
logOut.Debug(" 取待定位的分拣单， 数量 " + all.Count);
|
||||
logTest.Debug(" 取待定位的分拣单， 数量 " + all.Count);
|
||||
List<WmsOutPickRequest> seedsLst;
|
||||
|
||||
Dictionary<int, List<WmsOutPickRequest>> dicGroup = new Dictionary<int, List<WmsOutPickRequest>>();
|
||||
|
|
@ -565,7 +567,7 @@ namespace DeiNiu.wms.Logical
|
|||
bool isHour = DateTime.Now.Hour >= WmsConstants.SEEDS_START_HOUR && DateTime.Now.Hour <= WmsConstants.SEEDS_END_HOUR;
|
||||
bool isMinute = DateTime.Now.Minute >= WmsConstants.SEEDS_START_MINUTES && DateTime.Now.Hour <= WmsConstants.SEEDS_END_MINUTES;
|
||||
|
||||
logOut.Debug(string.Format("系统总拣开始时间{0}:{1},系统总拣结束时间{2}:{3}, 可以总拣？ {4}",
|
||||
logTest.Debug(string.Format("系统总拣开始时间{0}:{1},系统总拣结束时间{2}:{3}, 可以总拣？ {4}",
|
||||
WmsConstants.SEEDS_START_HOUR, WmsConstants.SEEDS_START_MINUTES, WmsConstants.SEEDS_END_HOUR, WmsConstants.SEEDS_END_MINUTES, isHour && isMinute));
|
||||
|
||||
|
||||
|
|
@ -607,7 +609,7 @@ namespace DeiNiu.wms.Logical
|
|||
dicGroup[opr.pickGroup].Add(opr);
|
||||
}
|
||||
|
||||
logOut.Debug(" 待定位的分拣单,分组数量 " + dicGroup.Count);
|
||||
// logOut.Debug(" 待定位的分拣单,分组数量 " + dicGroup.Count);
|
||||
foreach (int group in dicGroup.Keys)
|
||||
{
|
||||
seedsLst = dicGroup[group];
|
||||
|
|
@ -615,12 +617,12 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
continue;
|
||||
}
|
||||
logOut.Debug(" 分组 " + group);
|
||||
// logOut.Debug(" 分组 " + group);
|
||||
|
||||
WmsOutPickRequest seedPickRequest = new WmsOutPickRequest();
|
||||
DataTable dtSeeds = seedPickRequest.getNewSeedDetails(group);
|
||||
|
||||
logSpec.Debug(string.Format("randomMark:{0} , seeds detail count {1}", group, dtSeeds.Rows.Count));
|
||||
// logSpec.Debug(string.Format("randomMark:{0} , seeds detail count {1}", group, dtSeeds.Rows.Count));
|
||||
|
||||
|
||||
if (dtSeeds.Rows.Count > 0)
|
||||
|
|
@ -638,7 +640,7 @@ namespace DeiNiu.wms.Logical
|
|||
seedPickRequest.tranLocationId = new TmsStock().getSeedsLocation();
|
||||
|
||||
|
||||
logOut.Debug(string.Format("生成 播种拣选单 :{0} ", seedPickRequest.pickOrderNo));
|
||||
// logOut.Debug(string.Format("生成 播种拣选单 :{0} ", seedPickRequest.pickOrderNo));
|
||||
|
||||
|
||||
List<WmsOutPickDetail> lstwpd = new List<WmsOutPickDetail>();
|
||||
|
|
@ -649,27 +651,18 @@ namespace DeiNiu.wms.Logical
|
|||
// logSpec.Debug(" pd state is .." + pd.state);
|
||||
|
||||
|
||||
logTest.Debug( string.Format(" goodsId {4},is seedsout {5}, canSeedOut {0}. isZhitong {1}, isWeightOut {2}, WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT {3}", pd.goods.canSeedOut, pd.goods.isZhitong, pd.goods.isWeightOut(), WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT, pd.goods.goodsId, pd.goods.isSeedsOut()));
|
||||
// logTest.Debug( string.Format(" goodsId {4},is seedsout {5}, canSeedOut {0}. isZhitong {1}, isWeightOut {2}, WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT {3}", pd.goods.canSeedOut, pd.goods.isZhitong, pd.goods.isWeightOut(), WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT, pd.goods.goodsId, pd.goods.isSeedsOut()));
|
||||
|
||||
|
||||
if (pd.goods.isSeedsOut() )
|
||||
{
|
||||
|
||||
if(pd.goods.goodsId== "P04100")
|
||||
{
|
||||
logTest.Debug(string.Format(" goods P04100!! goodsId {4}, canSeedOut {0}. isZhitong {1}, isWeightOut {2}, WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT {3}", pd.goods.canSeedOut, pd.goods.isZhitong, pd.goods.isWeightOut(), WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT, pd.goods.goodsId));
|
||||
|
||||
|
||||
logSpec.Error(" goods P04100 SEEDED !!!!!");
|
||||
}
|
||||
|
||||
|
||||
lstwpd.Add(pd);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
logSpec.Debug(string.Format("goods id {0} is not seeded ,is weight? {1}",pd.goods.goodsId,pd.goods.isWeightOut()));
|
||||
// logSpec.Debug(string.Format("goods id {0} is not seeded ,is weight? {1}",pd.goods.goodsId,pd.goods.isWeightOut()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -780,12 +773,12 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (isSeedsCreated)
|
||||
{
|
||||
logOut.Debug(" 从新取待定位的拣货单 -------------------------------------------------------------- ");
|
||||
// logOut.Debug(" 从新取待定位的拣货单 -------------------------------------------------------------- ");
|
||||
|
||||
all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位);
|
||||
}
|
||||
|
||||
logOut.Debug(all.Count + " 个待定位的拣货单 ---------------------------------------------------------- ");
|
||||
// logOut.Debug(all.Count + " 个待定位的拣货单 ---------------------------------------------------------- ");
|
||||
|
||||
DateTime dateTime = DateTime.Now;
|
||||
foreach (WmsOutPickRequest opr in all)
|
||||
|
|
@ -812,17 +805,17 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
}
|
||||
|
||||
logOut.Debug("开始生成补货单...>");
|
||||
// logOut.Debug("开始生成补货单...>");
|
||||
createGoodsRepOrder();
|
||||
logOut.Debug("补货单生成结束...<");
|
||||
// logOut.Debug("补货单生成结束...<");
|
||||
|
||||
all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.等待补货);
|
||||
|
||||
logOut.Debug(all.Count + " 个等待补货订单 ----------------------------------------------------------------- ");
|
||||
// logTest.Debug(all.Count + " 个等待补货订单 ----------------------------------------------------------------- ");
|
||||
|
||||
foreach (WmsOutPickRequest opr in all)
|
||||
{
|
||||
logOut.Debug("待补货： " + opr.pickOrderNo + " state " + opr.state);
|
||||
logTest.Debug("待补货： " + opr.pickOrderNo + " state " + opr.state);
|
||||
|
||||
opr.checkedTime = string.Empty;
|
||||
requestOutStock(opr);
|
||||
|
|
@ -838,7 +831,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (isOverTime)
|
||||
{
|
||||
logOut.Debug(" is over time ?" + isOverTime);
|
||||
logTest.Debug(" is over time ?" + isOverTime);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -858,7 +851,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
foreach (DataRow drx in dtdiff.Rows)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(lWmsOutRequest), "goods store lack detected: to insert... ");
|
||||
// LogHelper.WriteLog(typeof(lWmsOutRequest), "goods store lack detected: to insert... ");
|
||||
|
||||
WmsStockLack sl = new WmsStockLack(drx);
|
||||
|
||||
|
|
@ -870,7 +863,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
}
|
||||
|
||||
LogHelper.WriteLog(typeof(lWmsOutRequest), "goods store lack detected: " + wor.orderNo + ", new id " + sl.ID);
|
||||
// LogHelper.WriteLog(typeof(lWmsOutRequest), "goods store lack detected: " + wor.orderNo + ", new id " + sl.ID);
|
||||
|
||||
updateDetailStockShortage(wor, sl.skuId, sl.lackCount);
|
||||
|
||||
|
|
@ -888,7 +881,7 @@ namespace DeiNiu.wms.Logical
|
|||
wor.operater = this.operId;
|
||||
wor.Update();
|
||||
outRequest.updateDetailStockShortage(wor.orderNo, skuId, lackCount);
|
||||
LogHelper.debug(typeof(WmsOutRequest), " begin delete temp 2");
|
||||
// LogHelper.debug(typeof(WmsOutRequest), " begin delete temp 2");
|
||||
outRequest.deleteTmp(wor.orderNo);
|
||||
}
|
||||
else
|
||||
|
|
@ -2506,12 +2499,13 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
foreach (WmsLocation nloc in locs)
|
||||
{
|
||||
WmsStock newstk = new WmsStock(nloc.locationId, requestDetail.skuId, requestDetail.goodsId);
|
||||
// WmsStock newstk = new WmsStock(nloc.locationId, requestDetail.skuId, requestDetail.goodsId);
|
||||
WmsStock newstk = new WmsStock();
|
||||
|
||||
newstk.virtialCount += lackCnt;
|
||||
|
||||
|
||||
if (newstk.ID == 0)
|
||||
if (newstk.ID == 0 || newstk.getAvCount() < 0)
|
||||
{
|
||||
|
||||
newstk.locationId = nloc.locationId;
|
||||
|
|
@ -2530,7 +2524,7 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
|
||||
|
||||
logOut.Debug("to create new stk " + newstk.ToString());
|
||||
// logOut.Debug("to create new stk " + newstk.ToString());
|
||||
}
|
||||
|
||||
// logOut.Debug("to create new virtual stk " + newstk.ToString());
|
||||
|
|
@ -3284,7 +3278,7 @@ namespace DeiNiu.wms.Logical
|
|||
r.orderNo = pickDetail.pickOrderNo.Trim();
|
||||
r.rectype = (int)stockOutType;//out
|
||||
|
||||
logOut.Debug("1 stock.virtialCount " + stock.virtialCount);
|
||||
// logOut.Debug("1 stock.virtialCount " + stock.virtialCount);
|
||||
// if (stock.virtialCount >0)
|
||||
if (pickDetail.lackCount > 0)
|
||||
{
|
||||
|
|
@ -3309,7 +3303,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
|
||||
}
|
||||
logOut.Debug("2 stock.virtialCount " + stock.virtialCount);
|
||||
// logOut.Debug("2 stock.virtialCount " + stock.virtialCount);
|
||||
// r.regeditCode = goods..Trim();
|
||||
r.operater = this.operId;
|
||||
r.orderDetailId = pickDetail.ID;//order detailId,同步 零货捡取临时数据、复核临时数据 的状态
|
||||
|
|
|
|||
|
|
@ -628,7 +628,7 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder));
|
||||
toP.Update();
|
||||
logPlate.Debug(string.Format("plate {0} start new trans {1}", toPlate, toP.transNo));
|
||||
logPlate.Debug(string.Format("1 plate {0} start new trans {1}", toPlate, toP.transNo));
|
||||
new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo;
|
||||
}
|
||||
|
||||
|
|
@ -840,7 +840,7 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder));
|
||||
|
||||
logPlate.Debug(string.Format("plate {0} start new trans {1}", toPlate, toP.transNo));
|
||||
logPlate.Debug(string.Format("2 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo,toP.ID));
|
||||
new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo;
|
||||
|
||||
// return enumRegPlateResult.完成装车集货后才能装车;
|
||||
|
|
@ -889,6 +889,7 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
toP.Update();
|
||||
}
|
||||
logPlate.Debug(string.Format("3 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo, toP.ID));
|
||||
|
||||
foreach (WmsOutPickRequest req in requests)
|
||||
{
|
||||
|
|
@ -899,7 +900,8 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (WmsConstants.IS_PLATE_IN_LINE && !WmsConstants.AUTO_LOAD_TRUCK )
|
||||
{
|
||||
if (fromP.ID > 0)
|
||||
{
|
||||
//to release plates of customer type
|
||||
|
|
@ -919,8 +921,6 @@ namespace DeiNiu.wms.Logical
|
|||
//to release plate of Line
|
||||
// 线路码头容器里面的客户容器是否已经全部装车了，如果都已装车(释放)，则释放线路容器
|
||||
|
||||
|
||||
|
||||
if (fromP.plateLevel == (int)enumPlateLevel.客户集货)
|
||||
{
|
||||
WmsPlate linePlate = new WmsPlate(fromP.inPlate);
|
||||
|
|
@ -935,6 +935,9 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
string ldTask = fromP.jobNo;
|
||||
|
|
@ -1085,7 +1088,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (tranP.plateLevel == (int)enumPlateLevel.临时容器)
|
||||
{
|
||||
// tranP.Delete();
|
||||
tranP.Delete();
|
||||
}
|
||||
|
||||
scope.Complete();
|
||||
|
|
@ -1350,7 +1353,9 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
public DataTable getUnLoadTruckStks(string toPlate, int cnt)
|
||||
{
|
||||
return plateStk.getUnLoadTruckStks(toPlate,cnt);
|
||||
log.Debug(string.Format("...... to getUnLoadTruckStks plateId {0}",toPlate));
|
||||
WmsPlate toP = new WmsPlate(toPlate);
|
||||
return plateStk.getUnLoadTruckStks(toP.transNo,cnt);
|
||||
}
|
||||
|
||||
public DataTable getLoadContent(string toPlate)
|
||||
|
|
|
|||
|
|
@ -1422,7 +1422,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
public void downAll(int start)
|
||||
{
|
||||
/*
|
||||
|
||||
WmsStock stock = new WmsStock();
|
||||
DataTable dt = stock.QueryActived().Tables[0];
|
||||
logTest.Debug(" downall stock list cnt" + dt.Rows.Count);
|
||||
|
|
@ -1433,14 +1433,14 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
|
||||
stock = new WmsStock(dr.Row);
|
||||
string flow = stock.locationId.Substring(0, 2);
|
||||
string flow = stock.locationId.Substring(0, 1);
|
||||
if (stock.locationId.StartsWith(start+"") || start==0)
|
||||
this. upDownGoodsCountWithLocation(stock.locationId,stock.goodsId,stock.skuId, stock.batch, stock.count, "初始下架", enumStockRecordType.移库下架, 0, flow);
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
WmsStock stock = new WmsStock();
|
||||
|
||||
// WmsStock stock = new WmsStock();
|
||||
// DataTable dt = stock.queryTmps() ;
|
||||
/*
|
||||
DataView dv = dt.DefaultView;
|
||||
|
|
@ -1474,6 +1474,8 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
DataSet ds = stock.queryTmps();
|
||||
|
||||
DataTable dtStk = ds.Tables[0];
|
||||
|
|
@ -1514,6 +1516,8 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,6 +210,8 @@ namespace DeiNiu.wms.Logical
|
|||
scope.Complete();
|
||||
}
|
||||
|
||||
WmsConstants.CURRENT_PANDIAN_ORDER = orderNo;
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
|
@ -234,6 +236,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
public bool finishPandian(string orderNo)
|
||||
{
|
||||
WmsConstants.CURRENT_PANDIAN_ORDER = "";
|
||||
WmsStockPandian pandian = new WmsStockPandian(orderNo);
|
||||
pandian.operater = operId;
|
||||
pandian.status = (int)enumPandianStatus.盘点结束;
|
||||
|
|
@ -257,6 +260,9 @@ namespace DeiNiu.wms.Logical
|
|||
scope.Complete();
|
||||
}
|
||||
|
||||
WmsConstants.CURRENT_PANDIAN_ORDER = "";
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -386,9 +392,14 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
|
||||
logPandian.Debug(string.Format(" new pandian item: orderNo {0},locationId {1},mirrroId {2},goodsId {3},prdDate {4},batch{5},count {6}", orderNo, locationId, mirrroId, goodsId, prdDate, batch, count));
|
||||
WmsStockPandian wsp = null;
|
||||
|
||||
if (string.IsNullOrEmpty(orderNo))
|
||||
{
|
||||
wsp= getWmsStockPandian.getCurrentPandianOrder();
|
||||
}else
|
||||
wsp = new WmsStockPandian(orderNo);
|
||||
|
||||
WmsStockPandian wsp = new WmsStockPandian(orderNo);
|
||||
if(wsp.status != (int)enumPandianStatus.开始采集)
|
||||
{
|
||||
return false;
|
||||
|
|
@ -456,10 +467,26 @@ namespace DeiNiu.wms.Logical
|
|||
if (wr.ID > 0)
|
||||
{
|
||||
cnt = wr.Update() ;
|
||||
}
|
||||
}else
|
||||
{
|
||||
|
||||
|
||||
WmsStockPandianStockMirror sm = new WmsStockPandianStockMirror();
|
||||
sm.skuId = wr.skuId;
|
||||
sm.batch = wr.batch;
|
||||
sm.goodsId = wr.goodsId;
|
||||
sm.locationId = wr.locationId;
|
||||
sm.orderNo = wr.orderNo;
|
||||
sm.productDate= wr.productDate;
|
||||
sm.validDate = wr.validDate;
|
||||
sm.skuCode = wr.skuCode;
|
||||
sm.shelfCount = wr.avCount;
|
||||
|
||||
wr.mirrorId = sm.Add();
|
||||
|
||||
cnt = wr.Add();
|
||||
|
||||
|
||||
}
|
||||
|
||||
logPandian.Debug(" done... new pandian result: " + wr +" , success? " +(cnt > 0));
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ namespace DeiNiu.wms.Logical
|
|||
return;
|
||||
}
|
||||
|
||||
WmsConstants.CURRENT_PANDIAN_ORDER = new WmsStockPandian().getCurrentPandian();
|
||||
|
||||
DataTable dtSetup;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,9 +35,10 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
foreach (WcfWmsGoods wg in goods)
|
||||
{
|
||||
log.Debug("goods name " + wg.goodsId + " , canSeedOut :" + wg.canSeedOut);
|
||||
// log.Debug("goods name " + wg.goodsId + " , canSeedOut :" + wg.canSeedOut);
|
||||
|
||||
WmsGoods gd = wg.getDbObject();// getWmsGoods(wg);
|
||||
log.Debug( getOperId()+ " to update " + gd);
|
||||
gd.Update();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -582,6 +582,14 @@ namespace DeiNiu.Wcf
|
|||
UriTemplate = "stockOut/seedsPickOut")]
|
||||
FormatedResult seedsPickOut(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
|
||||
|
||||
|
||||
|
||||
[OperationContract]
|
||||
[WebInvoke(Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped,
|
||||
UriTemplate = "stockOut/seedsPickOut2")]
|
||||
FormatedResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
|
||||
|
||||
|
||||
/*
|
||||
|
||||
[OperationContract]
|
||||
|
|
|
|||
|
|
@ -73,6 +73,10 @@ namespace DeiNiu.Wcf
|
|||
[OperationContract]
|
||||
DataTable getReceiveHistory(string orderNo);
|
||||
|
||||
|
||||
[OperationContract]
|
||||
DataTable getReceiveMuiltiHistory(string orderNo);
|
||||
|
||||
[OperationContract]
|
||||
DataSet getShipRecs(string querystr, int rownumStart, int rownumEnd);
|
||||
[OperationContract]
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
|
||||
自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。
|
||||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<WebPublishMethod>MSDeploy</WebPublishMethod>
|
||||
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
||||
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
||||
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
||||
<SiteUrlToLaunchAfterPublish />
|
||||
<ExcludeApp_Data>false</ExcludeApp_Data>
|
||||
<MSDeployServiceURL>localhost</MSDeployServiceURL>
|
||||
<DeployIisAppPath>restService</DeployIisAppPath>
|
||||
<RemoteSitePhysicalPath />
|
||||
<SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
|
||||
<MSDeployPublishMethod>InProc</MSDeployPublishMethod>
|
||||
<EnableMSDeployBackup>false</EnableMSDeployBackup>
|
||||
<EnableMsDeployAppOffline>false</EnableMsDeployAppOffline>
|
||||
<UserName />
|
||||
<_SavePWD>false</_SavePWD>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
|
||||
自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。
|
||||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<TimeStampOfAssociatedLegacyPublishXmlFile />
|
||||
<EncryptedPassword />
|
||||
<History>True|2024-03-20T14:55:40.0397610Z;True|2024-03-20T22:42:21.0790187+08:00;True|2024-03-20T22:36:09.2791989+08:00;True|2024-03-20T22:22:12.9730279+08:00;True|2024-03-20T19:54:32.1698921+08:00;True|2024-03-20T19:54:09.8789983+08:00;True|2024-03-20T19:21:19.0080195+08:00;True|2024-03-20T15:40:39.8706246+08:00;True|2024-03-20T08:55:54.5146171+08:00;True|2024-03-19T19:43:40.4120707+08:00;True|2024-03-19T18:44:16.3121326+08:00;True|2024-03-19T13:39:00.7981191+08:00;True|2024-03-19T13:35:01.7794426+08:00;True|2024-03-19T11:32:08.9351827+08:00;False|2024-03-19T11:31:34.3574177+08:00;True|2024-03-15T22:20:49.9543261+08:00;True|2024-03-14T18:05:27.5226179+08:00;True|2024-03-14T18:04:22.9552845+08:00;True|2024-03-13T21:12:28.9157626+08:00;True|2024-03-10T19:33:40.9271322+08:00;True|2024-03-06T18:49:41.0345462+08:00;True|2024-03-06T18:17:41.7374273+08:00;True|2024-03-06T18:12:23.8953777+08:00;True|2024-03-05T14:41:43.0493268+08:00;True|2024-03-05T10:34:01.8181582+08:00;True|2024-03-05T10:33:41.6827293+08:00;True|2024-03-04T21:44:07.3387316+08:00;True|2024-03-04T21:15:19.6954718+08:00;True|2024-03-04T21:14:57.9591923+08:00;True|2024-03-04T19:47:10.4489216+08:00;True|2024-03-03T09:25:24.1437972+08:00;True|2024-03-02T16:10:09.9360774+08:00;True|2024-03-02T12:39:56.7993047+08:00;True|2024-03-01T17:51:52.7749703+08:00;True|2024-03-01T17:44:53.9566064+08:00;True|2024-03-01T17:39:23.0891734+08:00;True|2024-03-01T14:27:56.7473404+08:00;True|2024-03-01T13:32:26.9532310+08:00;True|2024-03-01T09:46:11.9247046+08:00;True|2024-02-28T21:56:14.6129398+08:00;True|2024-02-27T10:15:36.1332202+08:00;True|2024-02-27T10:14:34.9579768+08:00;True|2024-02-27T09:57:11.5785797+08:00;True|2024-02-21T12:58:18.0087896+08:00;True|2024-02-19T12:47:50.8170331+08:00;True|2024-02-19T12:14:18.6431662+08:00;True|2024-02-19T12:11:35.2671748+08:00;True|2024-02-06T21:10:42.6568450+08:00;</History>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -183,7 +183,10 @@ namespace DeiNiu.Wcf
|
|||
return "ERP transfering data to wms, sleep a while...";
|
||||
}
|
||||
|
||||
|
||||
if (!String.IsNullOrEmpty(WmsConstants.CURRENT_PANDIAN_ORDER))
|
||||
{
|
||||
return "盘点进行中。。。。" + WmsConstants.CURRENT_PANDIAN_ORDER;
|
||||
}
|
||||
|
||||
|
||||
log.Debug("start sync and create pickoutrequest ,status " +status);
|
||||
|
|
@ -363,6 +366,11 @@ namespace DeiNiu.Wcf
|
|||
try
|
||||
{
|
||||
|
||||
if (WmsConstants.ERP_NOTICE_STOCK_OUT_DOING)
|
||||
{
|
||||
log.Debug(" 正在同步工作中，稍后再试");
|
||||
return " 正在同步工作中，稍后再试";
|
||||
}
|
||||
lop.retryNoticeErp();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,6 +155,14 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
return lir.getReceiveHistory(orderNo);
|
||||
}
|
||||
|
||||
public DataTable getReceiveMuiltiHistory(string orderNo)
|
||||
{
|
||||
return lir.getReceiveMuiltiHistory(orderNo);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public DataTable getReceivePreTmpSumByVender(string venderId)
|
||||
{
|
||||
return lir.getReceivePreSumByVender(venderId);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\winform\bin\Debug\log4net.dll</HintPath>
|
||||
<HintPath>.\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
|
|
@ -93,8 +93,11 @@
|
|||
<Content Include="CustomerService.svc" />
|
||||
<Content Include="Erp_bussinessDocService.svc" />
|
||||
<Content Include="GoodsService.svc" />
|
||||
<Content Include="log4net.dll" />
|
||||
<Content Include="log4net.pdb" />
|
||||
<Content Include="Login.svc" />
|
||||
<Content Include="LotService.svc" />
|
||||
<Content Include="Newtonsoft.Json.dll" />
|
||||
<Content Include="NodeService.svc" />
|
||||
<Content Include="OwnerService.svc" />
|
||||
<Content Include="RestLogin.svc" />
|
||||
|
|
@ -314,6 +317,7 @@
|
|||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
<None Include="Properties\PublishProfiles\IISProfile.pubxml" />
|
||||
<None Include="Properties\PublishProfiles\IISProfile1.pubxml" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
<NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
|
||||
<NameOfLastUsedPublishProfile>E:\ldj\source\vs\WcfService1\Properties\PublishProfiles\IISProfile1.pubxml</NameOfLastUsedPublishProfile>
|
||||
<ProjectView>ShowAllFiles</ProjectView>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ namespace WcfServiceAuthentication
|
|||
//
|
||||
if (authCach.ContainsKey(userId)) //检查内存
|
||||
{
|
||||
LogHelper.debug("AuthenticationInspector", string.Format("get userId {0} in the cache checking token {1},token match? {2}", userId, token, authCach[userId].Equals(token)));
|
||||
// LogHelper.debug("AuthenticationInspector", string.Format("get userId {0} in the cache checking token {1},token match? {2}", userId, token, authCach[userId].Equals(token)));
|
||||
#if DEBUG
|
||||
|
||||
if (!authCach[userId].Equals(token))
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace DeiNiu.Wcf
|
|||
|
||||
public Result add(ErpPurch obj)
|
||||
{
|
||||
log.Debug("add called --->" + obj.pur_order);
|
||||
log.Debug("add called --->" + obj);
|
||||
|
||||
using (TransactionScope scope = new TransactionScope())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfServiceErp\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
|
|
|
|||
|
|
@ -140,12 +140,12 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="..\packages\Microsoft.ApplicationInsights.Web.2.15.0\build\Microsoft.ApplicationInsights.Web.targets" Condition="Exists('..\packages\Microsoft.ApplicationInsights.Web.2.15.0\build\Microsoft.ApplicationInsights.Web.targets')" />
|
||||
<Import Project="..\packages\Microsoft.ApplicationInsights.Web.2.22.0\build\Microsoft.ApplicationInsights.Web.targets" Condition="Exists('..\packages\Microsoft.ApplicationInsights.Web.2.22.0\build\Microsoft.ApplicationInsights.Web.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Microsoft.ApplicationInsights.Web.2.15.0\build\Microsoft.ApplicationInsights.Web.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ApplicationInsights.Web.2.15.0\build\Microsoft.ApplicationInsights.Web.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.ApplicationInsights.Web.2.22.0\build\Microsoft.ApplicationInsights.Web.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ApplicationInsights.Web.2.22.0\build\Microsoft.ApplicationInsights.Web.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights.Web" version="2.15.0" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.Web" version="2.22.0" targetFramework="net40" />
|
||||
</packages>
|
||||
|
|
@ -71,9 +71,8 @@
|
|||
<NoWin32Manifest>true</NoWin32Manifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\winform\bin\Debug\log4net.dll</HintPath>
|
||||
<Reference Include="log4net">
|
||||
<HintPath>..\libs\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration.Install" />
|
||||
|
|
|
|||
|
|
@ -474,19 +474,19 @@
|
|||
// lbTotalOut
|
||||
//
|
||||
this.lbTotalOut.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbTotalOut.Location = new System.Drawing.Point(56, 316);
|
||||
this.lbTotalOut.Location = new System.Drawing.Point(131, 316);
|
||||
this.lbTotalOut.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbTotalOut.Name = "lbTotalOut";
|
||||
this.lbTotalOut.Size = new System.Drawing.Size(207, 18);
|
||||
this.lbTotalOut.Size = new System.Drawing.Size(132, 18);
|
||||
this.lbTotalOut.TabIndex = 94;
|
||||
//
|
||||
// lbTotalPlan
|
||||
//
|
||||
this.lbTotalPlan.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbTotalPlan.Location = new System.Drawing.Point(56, 292);
|
||||
this.lbTotalPlan.Location = new System.Drawing.Point(131, 292);
|
||||
this.lbTotalPlan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbTotalPlan.Name = "lbTotalPlan";
|
||||
this.lbTotalPlan.Size = new System.Drawing.Size(207, 18);
|
||||
this.lbTotalPlan.Size = new System.Drawing.Size(132, 18);
|
||||
this.lbTotalPlan.TabIndex = 93;
|
||||
//
|
||||
// btnDelOrder
|
||||
|
|
@ -528,19 +528,19 @@
|
|||
// lbCustname
|
||||
//
|
||||
this.lbCustname.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbCustname.Location = new System.Drawing.Point(56, 371);
|
||||
this.lbCustname.Location = new System.Drawing.Point(131, 371);
|
||||
this.lbCustname.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbCustname.Name = "lbCustname";
|
||||
this.lbCustname.Size = new System.Drawing.Size(207, 23);
|
||||
this.lbCustname.Size = new System.Drawing.Size(132, 23);
|
||||
this.lbCustname.TabIndex = 87;
|
||||
//
|
||||
// lbGoodsName
|
||||
//
|
||||
this.lbGoodsName.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbGoodsName.Location = new System.Drawing.Point(56, 263);
|
||||
this.lbGoodsName.Location = new System.Drawing.Point(131, 263);
|
||||
this.lbGoodsName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbGoodsName.Name = "lbGoodsName";
|
||||
this.lbGoodsName.Size = new System.Drawing.Size(207, 23);
|
||||
this.lbGoodsName.Size = new System.Drawing.Size(132, 23);
|
||||
this.lbGoodsName.TabIndex = 86;
|
||||
//
|
||||
// txtActuralCount
|
||||
|
|
@ -841,7 +841,7 @@
|
|||
this.chkDiff.MenuManager = this.ribbon;
|
||||
this.chkDiff.Name = "chkDiff";
|
||||
this.chkDiff.Properties.Caption = "";
|
||||
this.chkDiff.Size = new System.Drawing.Size(79, 19);
|
||||
this.chkDiff.Size = new System.Drawing.Size(20, 19);
|
||||
this.chkDiff.StyleController = this.layoutControl1;
|
||||
this.chkDiff.TabIndex = 88;
|
||||
//
|
||||
|
|
@ -920,10 +920,10 @@
|
|||
// lbSeedsGoodsName
|
||||
//
|
||||
this.lbSeedsGoodsName.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbSeedsGoodsName.Location = new System.Drawing.Point(56, 321);
|
||||
this.lbSeedsGoodsName.Location = new System.Drawing.Point(131, 321);
|
||||
this.lbSeedsGoodsName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbSeedsGoodsName.Name = "lbSeedsGoodsName";
|
||||
this.lbSeedsGoodsName.Size = new System.Drawing.Size(207, 23);
|
||||
this.lbSeedsGoodsName.Size = new System.Drawing.Size(132, 23);
|
||||
this.lbSeedsGoodsName.TabIndex = 86;
|
||||
//
|
||||
// txtOutCnt
|
||||
|
|
@ -953,10 +953,10 @@
|
|||
// lbSeedsNo
|
||||
//
|
||||
this.lbSeedsNo.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbSeedsNo.Location = new System.Drawing.Point(56, 263);
|
||||
this.lbSeedsNo.Location = new System.Drawing.Point(131, 263);
|
||||
this.lbSeedsNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbSeedsNo.Name = "lbSeedsNo";
|
||||
this.lbSeedsNo.Size = new System.Drawing.Size(207, 23);
|
||||
this.lbSeedsNo.Size = new System.Drawing.Size(132, 23);
|
||||
this.lbSeedsNo.TabIndex = 87;
|
||||
//
|
||||
// btnSeedsAdjust
|
||||
|
|
@ -974,19 +974,19 @@
|
|||
// lbSeedsBarcode
|
||||
//
|
||||
this.lbSeedsBarcode.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbSeedsBarcode.Location = new System.Drawing.Point(56, 292);
|
||||
this.lbSeedsBarcode.Location = new System.Drawing.Point(131, 292);
|
||||
this.lbSeedsBarcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbSeedsBarcode.Name = "lbSeedsBarcode";
|
||||
this.lbSeedsBarcode.Size = new System.Drawing.Size(207, 23);
|
||||
this.lbSeedsBarcode.Size = new System.Drawing.Size(132, 23);
|
||||
this.lbSeedsBarcode.TabIndex = 86;
|
||||
//
|
||||
// lbTotalPlan2
|
||||
//
|
||||
this.lbTotalPlan2.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.lbTotalPlan2.Location = new System.Drawing.Point(56, 350);
|
||||
this.lbTotalPlan2.Location = new System.Drawing.Point(131, 350);
|
||||
this.lbTotalPlan2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbTotalPlan2.Name = "lbTotalPlan2";
|
||||
this.lbTotalPlan2.Size = new System.Drawing.Size(207, 18);
|
||||
this.lbTotalPlan2.Size = new System.Drawing.Size(132, 18);
|
||||
this.lbTotalPlan2.TabIndex = 93;
|
||||
//
|
||||
// txtCustNm
|
||||
|
|
@ -1028,7 +1028,7 @@
|
|||
this.checkDone.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.checkDone.Name = "checkDone";
|
||||
this.checkDone.Properties.Caption = "";
|
||||
this.checkDone.Size = new System.Drawing.Size(79, 19);
|
||||
this.checkDone.Size = new System.Drawing.Size(20, 19);
|
||||
this.checkDone.StyleController = this.layoutControl1;
|
||||
this.checkDone.TabIndex = 88;
|
||||
//
|
||||
|
|
@ -1427,8 +1427,7 @@
|
|||
this.layoutControlItem38.Size = new System.Drawing.Size(213, 29);
|
||||
this.layoutControlItem38.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem38.Text = "商品名称";
|
||||
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem38.TextVisible = false;
|
||||
this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem39
|
||||
//
|
||||
|
|
@ -1473,8 +1472,7 @@
|
|||
this.layoutControlItem45.Size = new System.Drawing.Size(213, 29);
|
||||
this.layoutControlItem45.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem45.Text = "分播单号";
|
||||
this.layoutControlItem45.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem45.TextVisible = false;
|
||||
this.layoutControlItem45.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// emptySpaceItem17
|
||||
//
|
||||
|
|
@ -1539,8 +1537,7 @@
|
|||
this.layoutControlItem43.Size = new System.Drawing.Size(213, 29);
|
||||
this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem43.Text = "商品条码";
|
||||
this.layoutControlItem43.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem43.TextVisible = false;
|
||||
this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem44
|
||||
//
|
||||
|
|
@ -1553,8 +1550,7 @@
|
|||
this.layoutControlItem44.Size = new System.Drawing.Size(213, 24);
|
||||
this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem44.Text = "累计计划";
|
||||
this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem44.TextVisible = false;
|
||||
this.layoutControlItem44.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// emptySpaceItem23
|
||||
//
|
||||
|
|
@ -1595,8 +1591,7 @@
|
|||
this.layoutControlItem12.Size = new System.Drawing.Size(213, 29);
|
||||
this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem12.Text = "商品名称";
|
||||
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem12.TextVisible = false;
|
||||
this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem11
|
||||
//
|
||||
|
|
@ -1647,8 +1642,7 @@
|
|||
this.layoutControlItem37.Size = new System.Drawing.Size(213, 24);
|
||||
this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem37.Text = "累计实发";
|
||||
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem37.TextVisible = false;
|
||||
this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem28
|
||||
//
|
||||
|
|
@ -1660,8 +1654,7 @@
|
|||
this.layoutControlItem28.Size = new System.Drawing.Size(213, 24);
|
||||
this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem28.Text = "累计计划";
|
||||
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem28.TextVisible = false;
|
||||
this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem17
|
||||
//
|
||||
|
|
@ -1673,8 +1666,7 @@
|
|||
this.layoutControlItem17.Size = new System.Drawing.Size(213, 29);
|
||||
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem17.Text = "店铺名称";
|
||||
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem17.TextVisible = false;
|
||||
this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// layoutControlItem20
|
||||
//
|
||||
|
|
@ -1737,8 +1729,8 @@
|
|||
//
|
||||
this.tabbedControlGroup3.Location = new System.Drawing.Point(0, 0);
|
||||
this.tabbedControlGroup3.Name = "tabbedControlGroup3";
|
||||
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup6;
|
||||
this.tabbedControlGroup3.SelectedTabPageIndex = 1;
|
||||
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup12;
|
||||
this.tabbedControlGroup3.SelectedTabPageIndex = 0;
|
||||
this.tabbedControlGroup3.Size = new System.Drawing.Size(1936, 142);
|
||||
this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup12,
|
||||
|
|
@ -2032,9 +2024,8 @@
|
|||
this.layoutControlItem19.Text = "仅调整";
|
||||
this.layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
|
||||
this.layoutControlItem19.TextLocation = DevExpress.Utils.Locations.Right;
|
||||
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem19.TextToControlDistance = 0;
|
||||
this.layoutControlItem19.TextVisible = false;
|
||||
this.layoutControlItem19.TextSize = new System.Drawing.Size(54, 22);
|
||||
this.layoutControlItem19.TextToControlDistance = 5;
|
||||
//
|
||||
// layoutControlItem35
|
||||
//
|
||||
|
|
@ -2137,9 +2128,8 @@
|
|||
this.layoutControlItem57.Text = "已分拣";
|
||||
this.layoutControlItem57.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
|
||||
this.layoutControlItem57.TextLocation = DevExpress.Utils.Locations.Right;
|
||||
this.layoutControlItem57.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem57.TextToControlDistance = 0;
|
||||
this.layoutControlItem57.TextVisible = false;
|
||||
this.layoutControlItem57.TextSize = new System.Drawing.Size(54, 22);
|
||||
this.layoutControlItem57.TextToControlDistance = 5;
|
||||
//
|
||||
// emptySpaceItem24
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -36,7 +36,7 @@ public class PageBase : PagePublic
|
|||
|
||||
if (lem == null)
|
||||
{
|
||||
logobj.LoginLog(string.Empty,"lem is null");
|
||||
//logobj.LoginLog(string.Empty,"lem is null");
|
||||
Response.Redirect(DefaultPage);
|
||||
}
|
||||
if (HomePage.ToUpper() == requestPage) return;
|
||||
|
|
@ -49,9 +49,9 @@ public class PageBase : PagePublic
|
|||
if (lem.AuthList.Contains(requestPage)) return;
|
||||
if (!new LRoleAuthority().GetPublicAuthorityList().Contains(requestPage))
|
||||
{
|
||||
logobj.RequestPageLog();
|
||||
// logobj.RequestPageLog();
|
||||
|
||||
logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
|
||||
// logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
|
||||
|
||||
Response.Redirect(DefaultPage);
|
||||
}
|
||||
|
|
@ -81,7 +81,7 @@ public class PageBase : PagePublic
|
|||
{
|
||||
// ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
|
||||
DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
|
||||
logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
|
||||
// logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
|
||||
}
|
||||
}
|
||||
Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 525 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 525 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 525 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 525 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 525 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
|
|
@ -1,6 +1,7 @@
|
|||
<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" ClassName="Desktop"
|
||||
CodeFile="Desktop.aspx.cs" Inherits="Desktop" %>
|
||||
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
|
||||
<table class="Table_NoBorder" width="100%">
|
||||
|
||||
|
|
@ -181,6 +182,13 @@
|
|||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
|
||||
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</asp:Content>
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,10 @@
|
|||
<ItemStyle Wrap="False" HorizontalAlign="Center"/>
|
||||
<HeaderStyle Wrap="False" HorizontalAlign="Center"/>
|
||||
</asp:BoundField>
|
||||
<asp:BoundField DataField="AUTH_ORDER" HeaderText="权限编号" SortExpression="DEP_CODE">
|
||||
<ItemStyle Wrap="False" HorizontalAlign="Center"/>
|
||||
<HeaderStyle Wrap="False" HorizontalAlign="Center"/>
|
||||
</asp:BoundField>
|
||||
|
||||
<asp:BoundField DataField="AUTH_DESC" HeaderText="ȨÏÞÃèÊö" SortExpression="DEP_CODE">
|
||||
<ItemStyle Wrap="False" HorizontalAlign="Center"/>
|
||||
|
|
@ -122,6 +126,7 @@
|
|||
<asp:CheckBox ID="chkPublicInfo" runat="server" OnCheckedChanged="chkPublicInfo_CheckedChanged"
|
||||
AutoPostBack="true"></asp:CheckBox>
|
||||
<asp:CheckBox ID="chkAlert" runat="server" Text="ÅÜÂíµÆ"></asp:CheckBox>
|
||||
<asp:CheckBox ID="chkEnable" runat="server" Text="可用"></asp:CheckBox>
|
||||
</td>
|
||||
<td>
|
||||
<asp:Label ID="Label3" runat="server" CssClass="Label" Text="ȨÏÞÃèÊö"></asp:Label>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue