|
|
@@ -237,23 +237,28 @@ namespace MeterSceneLibrary
|
|
|
|
|
|
// 签发时间比较
|
|
|
// 通过上次洁净记录，找到该委托的签发时间
|
|
|
- int hour = 999;
|
|
|
+ //int hour = 999;
|
|
|
|
|
|
- if (lastPre.Succeed && lastPre.Data.Count == 1)
|
|
|
- {
|
|
|
- TimeSpan ts = new TimeSpan();
|
|
|
- ts = DateTime.Parse(DateTime.Now.ToString()) - DateTime.Parse(lastMeterWorkCarActual.netTime.ToString());
|
|
|
+ //if (lastPre.Succeed && lastPre.Data.Count == 1)
|
|
|
+ //{
|
|
|
+ // TimeSpan ts = new TimeSpan();
|
|
|
+ // ts = DateTime.Parse(DateTime.Now.ToString()) - DateTime.Parse(lastMeterWorkCarActual.netTime.ToString());
|
|
|
|
|
|
- hour = ts.Hours; //此为相差小时
|
|
|
- }
|
|
|
+ // hour = ts.Hours; //此为相差小时
|
|
|
+ //}
|
|
|
|
|
|
- // 混装逻辑 && 当次重量大于上次净重记录中的毛重值
|
|
|
- if (listPreScale[0].meterTypeNo.Equals("yyyy") && PbCache.lockWgt > lastMeterWorkCarActual.tareWeight)
|
|
|
- {
|
|
|
- isHZ = true;
|
|
|
- }
|
|
|
- // 两次委托发货单位一致，净重时间在4个小时之内
|
|
|
- else if (listPreScale[0].forwardingUnitNo.Equals(lastMeterWorkCarActual.forwardingUnitNo) && hour <= 4)
|
|
|
+ //// 混装逻辑 && 当次重量大于上次净重记录中的毛重值
|
|
|
+ //if (listPreScale[0].meterTypeNo.Equals("yyyy") && PbCache.lockWgt > lastMeterWorkCarActual.tareWeight)
|
|
|
+ //{
|
|
|
+ // isHZ = true;
|
|
|
+ //}
|
|
|
+ //// 两次委托发货单位一致，净重时间在4个小时之内
|
|
|
+ //else if (listPreScale[0].forwardingUnitNo.Equals(lastMeterWorkCarActual.forwardingUnitNo) && hour <= 4)
|
|
|
+ //{
|
|
|
+ // isHZ = true;
|
|
|
+ //}
|
|
|
+
|
|
|
+ if (lastPre.Data[0].predictionCombination == listPreScale[0].predictionCombination && lastPre.Data[0].predictionType == "7" && listPreScale[0].predictionType == "7")
|
|
|
{
|
|
|
isHZ = true;
|
|
|
}
|
duyong