|
@@ -168,6 +168,21 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
}catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+ //如果是十三号汽车衡,半条数据,减0.04吨
|
|
|
+ if("十三号汽车衡".equals(map.get("resultTareCalculateNumber"))
|
|
|
+ && (map.get("resultNetWeight") == null || "".equals(map.get("resultNetWeight")))){
|
|
|
+ BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
|
|
|
+ BigDecimal resultCrossWeight = DataChange.dataToBigDecimal(map.get("resultCrossWeight"));
|
|
|
+ if(resultTareWeight.doubleValue() > 0 && resultCrossWeight.doubleValue() == 0){
|
|
|
+ //皮重减0.04
|
|
|
+ map.put("resultTareWeight", resultTareWeight.subtract(new BigDecimal("0.04")).toString());
|
|
|
+ } else if(resultCrossWeight.doubleValue() > 0 && resultTareWeight.doubleValue() == 0){
|
|
|
+ //毛重减0.04
|
|
|
+ map.put("resultCrossWeight", resultCrossWeight.subtract(new BigDecimal("0.04")).toString());
|
|
|
+ }
|
|
|
+ logger.info("十三号汽车衡修改后计量信息:{}", new JSONObject(map));
|
|
|
+ }
|
|
|
+
|
|
|
if(map.get("flag") != null && map.get("flag").equals("GCXS")){
|
|
|
System.out.println("这是钢材销售");
|
|
|
TmstruckWeightResult tmstruckWeightResult = null;
|