|
@@ -376,7 +376,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
if(codeMap.get("orderNumber") != null) {
|
|
|
tmstruckWeightResult.setInsertUpdateRemark((String)codeMap.get("orderNumber"));
|
|
|
}
|
|
|
- if(resultNetWeight != null && !"".equals(resultNetWeight) && codeMap.get("saleMaterialId") != null) {
|
|
|
+ if(resultNetWeight != null && !"".equals(resultNetWeight)) {
|
|
|
codeMap.put("good",(codeMap.get("goodspa") + "" + codeMap.get("good")).replaceAll(" ",""));
|
|
|
BigDecimal materialId = tmstruckWeightResultMapper.getMaterialId(codeMap);
|
|
|
if(materialId == null){
|
|
@@ -384,6 +384,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
}
|
|
|
codeMap.put("materialId",materialId);
|
|
|
tmstruckWeightResult.setMaterialId(materialId);
|
|
|
+ }
|
|
|
+ if(resultNetWeight != null && !"".equals(resultNetWeight) && codeMap.get("saleMaterialId") != null) {
|
|
|
tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(codeMap.get("goodNum")));
|
|
|
tmstruckWeightResult.setSaleMaterialId(DataChange.dataToBigDecimal(codeMap.get("saleMaterialId")));
|
|
|
tmstruckWeightResult.setSaleMaterialId(saleMaterialId);
|
|
@@ -392,6 +394,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
|
|
|
if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
|
|
|
codeMap.put("segmentSqe", codeMap.get("tareSegmentSqe"));
|
|
|
+
|
|
|
}else{
|
|
|
|
|
|
BigDecimal orderLineSqe = tmstruckWeightResultMapper.selectOrderLineSqe(DataChange.dataToBigDecimal(codeMap.get("resultTotalId")));
|
|
@@ -1265,4 +1268,12 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
tmstruckWeightBatchMapper.insertSelective(tmstruckWeightBatch);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|