|
|
@@ -457,67 +457,6 @@ namespace MeterSceneLibrary.JISCO
|
|
|
return rt;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 产生一次计量数据,同时结净并匹配委托
|
|
|
- /// </summary>
|
|
|
- /// <param name="scale"></param>
|
|
|
- /// <param name="actualFirst"></param>
|
|
|
- public rtInfo doNetAndScale(PreTrackScale scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst2)
|
|
|
- {
|
|
|
- // 构造结净数据
|
|
|
- MeterWorkCarActual netDb = new MeterWorkCarActual();
|
|
|
-
|
|
|
- // 复制对象
|
|
|
- if (scale != null)
|
|
|
- {
|
|
|
- EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
|
|
|
- netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
|
|
|
- }
|
|
|
-
|
|
|
- netDb.tareTime = DateTime.Now;
|
|
|
- netDb.tareWeight = actualFirst.meterWeight.Value < PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁小谁是皮 BourneCao
|
|
|
- netDb.baseSpot2No = PbCache.sportInfo.baseSpotNo;
|
|
|
- netDb.baseSpot2Name = PbCache.sportInfo.baseSpotName;
|
|
|
- netDb.tareMode = "2";//1:远程计量;2:智能计量;3:手工录入;4:放行智能计量;5:滞后匹配
|
|
|
- /* netDb.tare_man_no = "";
|
|
|
- netDb.tare_man_name = "";
|
|
|
- netDb.tare_class = "";
|
|
|
- netDb.tare_group = "";*/
|
|
|
-
|
|
|
- netDb.actualFirst1No = actualFirst.actualFirstNo;
|
|
|
- netDb.actualFirst2No = actualFirst.actualFirstNo;
|
|
|
- netDb.grossTime = actualFirst.createTime;
|
|
|
- netDb.grossWeight = actualFirst.meterWeight.Value > PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁大谁是毛 BourneCao
|
|
|
- netDb.baseSpot1No = actualFirst.baseSpotNo;
|
|
|
- netDb.baseSpot1Name = actualFirst.baseSpotName;
|
|
|
- netDb.grossMode = "2"; // 1:远程计量;2:智能计量;3:手工录入;4:放行智能计量;5:滞后匹配
|
|
|
- netDb.grossManNo = actualFirst.createManNo;
|
|
|
- netDb.grossManName = actualFirst.createManName;
|
|
|
- netDb.grossClass = actualFirst.meterClass;
|
|
|
- netDb.grossGroup = actualFirst.meterGroup;
|
|
|
- netDb.valueFlag = "1";
|
|
|
-
|
|
|
- netDb.netTime = DateTime.Now;
|
|
|
-
|
|
|
- //netDb.netManNo = appUser.userid; //净重计量员编码
|
|
|
- //netDb.netManName = appUser.username; //净重计量员名称
|
|
|
- netDb.netSpot3No = PbCache.sportInfo.baseSpotNo; //净重计量点编号
|
|
|
- netDb.netSpot3Name = PbCache.sportInfo.baseSpotName; //净重计量点
|
|
|
-
|
|
|
- netDb.addWeight = (actualFirst.addWeight == null ? 0 : actualFirst.addWeight.Value);
|
|
|
- //净重=毛-皮-附加重量
|
|
|
- netDb.netWeight = netDb.grossWeight - netDb.tareWeight - netDb.addWeight;
|
|
|
- netDb.netMode = "1"; //1:正常结净;2:匹配结净
|
|
|
- netDb.valueFlag = "0"; //0=有效,1=作废
|
|
|
- netDb.uploadFlag = "0"; //0=待审核;1:待上传;2=已上传
|
|
|
- //要判断下当前是否勾选了不验证皮重
|
|
|
-
|
|
|
-
|
|
|
- // 保存结净记录,后续改成统一提交模式 BourneCao
|
|
|
-
|
|
|
- return rt;
|
|
|
- }
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 产生一次计量数据,同时结净并匹配委托(多委托)
|
|
|
/// </summary>
|
|
|
@@ -708,65 +647,6 @@ namespace MeterSceneLibrary.JISCO
|
|
|
return rt;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 一车多卸
|
|
|
- /// a. 取第一条委托正常洁净产生一条净重记录
|
|
|
- /// b.并自动生成一条一次毛重计量数据并和第二条委托匹配,重量值为当次计量数据中的毛重
|
|
|
- /// </summary>
|
|
|
- /// <param name="scale"></param>
|
|
|
- /// <param name="actualFirst"></param>
|
|
|
- public rtInfo doNetMass(List<PreTrackScale> scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst1)
|
|
|
- {
|
|
|
- // 构造结净数据
|
|
|
- MeterWorkCarActual netDb = new MeterWorkCarActual();
|
|
|
-
|
|
|
- // 复制对象
|
|
|
- if (scale != null)
|
|
|
- {
|
|
|
- EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
|
|
|
- netDb = entityBase.format<MeterWorkCarActual>(scale[0], netDb);
|
|
|
- }
|
|
|
-
|
|
|
- netDb.tareTime = DateTime.Now;
|
|
|
- netDb.tareWeight = actualFirst.meterWeight.Value < PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁小谁是皮 BourneCao
|
|
|
- netDb.baseSpot2No = PbCache.sportInfo.baseSpotNo;
|
|
|
- netDb.baseSpot2Name = PbCache.sportInfo.baseSpotName;
|
|
|
- netDb.tareMode = "2";//1:远程计量;2:智能计量;3:手工录入;4:放行智能计量;5:滞后匹配
|
|
|
- /* netDb.tare_man_no = "";
|
|
|
- netDb.tare_man_name = "";
|
|
|
- netDb.tare_class = "";
|
|
|
- netDb.tare_group = "";*/
|
|
|
-
|
|
|
- netDb.actualFirst1No = actualFirst.actualFirstNo;
|
|
|
- netDb.grossTime = actualFirst.createTime;
|
|
|
- netDb.grossWeight = actualFirst.meterWeight.Value > PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁大谁是毛 BourneCao
|
|
|
- netDb.baseSpot1No = actualFirst.baseSpotNo;
|
|
|
- netDb.baseSpot1Name = actualFirst.baseSpotName;
|
|
|
- netDb.grossMode = "2"; // 1:远程计量;2:智能计量;3:手工录入;4:放行智能计量;5:滞后匹配
|
|
|
- netDb.grossManNo = actualFirst.createManNo;
|
|
|
- netDb.grossManName = actualFirst.createManName;
|
|
|
- netDb.grossClass = actualFirst.meterClass;
|
|
|
- netDb.grossGroup = actualFirst.meterGroup;
|
|
|
-
|
|
|
- netDb.netTime = DateTime.Now;
|
|
|
-
|
|
|
- //netDb.netManNo = appUser.userid; //净重计量员编码
|
|
|
- //netDb.netManName = appUser.username; //净重计量员名称
|
|
|
- netDb.netSpot3No = PbCache.sportInfo.baseSpotNo; //净重计量点编号
|
|
|
- netDb.netSpot3Name = PbCache.sportInfo.baseSpotName; //净重计量点
|
|
|
-
|
|
|
- netDb.addWeight = (actualFirst.addWeight == null ? 0 : actualFirst.addWeight.Value);
|
|
|
- //净重=毛-皮-附加重量
|
|
|
- netDb.netWeight = netDb.grossWeight - netDb.tareWeight - netDb.addWeight;
|
|
|
- netDb.netMode = "1"; //1:正常结净;2:匹配结净
|
|
|
- netDb.valueFlag = "0"; //0=有效,1=作废
|
|
|
- netDb.uploadFlag = "0"; //0=待审核;1:待上传;2=已上传
|
|
|
- //要判断下当前是否勾选了不验证皮重
|
|
|
-
|
|
|
- // 保存结净记录,后续改成统一提交模式 BourneCao
|
|
|
-
|
|
|
- return rt;
|
|
|
- }
|
|
|
|
|
|
public rtInfo validHisTare(string WeightType = "001033001")
|
|
|
{
|