|
@@ -61,7 +61,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
* "resultNetWeight":0,
|
|
* "resultNetWeight":0,
|
|
|
* "resultTareWeightTime":"2021-09-10 09:05:22",
|
|
* "resultTareWeightTime":"2021-09-10 09:05:22",
|
|
|
* "resultCrossWeightTime":"2021-09-10 09:05:22",
|
|
* "resultCrossWeightTime":"2021-09-10 09:05:22",
|
|
|
- * "resultNetWeightTime":"2021-09-10 09:05:22",
|
|
|
|
|
* "resultPoundNo":"Bd123456780",
|
|
* "resultPoundNo":"Bd123456780",
|
|
|
* "materialId":40
|
|
* "materialId":40
|
|
|
* @param mapList
|
|
* @param mapList
|
|
@@ -125,7 +124,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
|
|
tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
|
|
|
String resultCrossWeightTime = (String) map.get("resultCrossWeightTime");
|
|
String resultCrossWeightTime = (String) map.get("resultCrossWeightTime");
|
|
|
//如果是采购订单 先计毛再计皮
|
|
//如果是采购订单 先计毛再计皮
|
|
|
- if("5678".contains(orderType.toString())){
|
|
|
|
|
|
|
+ if("5678".contains(orderType.toString()) || orderType.intValue() == 12 || orderType.intValue() == 14){
|
|
|
//如果毛重数据为空 则是第一次计量为毛重 此时第一次计量时间放皮重时间里面
|
|
//如果毛重数据为空 则是第一次计量为毛重 此时第一次计量时间放皮重时间里面
|
|
|
if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
|
|
if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
|
|
|
//设置毛重时间
|
|
//设置毛重时间
|
txf