|
|
@@ -57,29 +57,6 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
|
|
|
try {
|
|
|
//1.根据运输订单号查询主干信息
|
|
|
map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
|
|
|
- //备注信息的查找以及修改
|
|
|
- //String note=tmstruckLeaveFactoryResultMapper.querynote(orderNumber);
|
|
|
- //Date date=tmstruckLeaveFactoryResultMapper.queryDate(orderNumber);
|
|
|
- //if (date!=null&&!("".equals(date))){
|
|
|
- // map.put("note",note);
|
|
|
- //}else {
|
|
|
- // if(note!=null&&!("".equals(note))){
|
|
|
- // String regex="\\d{1,2}\\.\\d{1,2}";
|
|
|
- // Pattern pattern=Pattern.compile(regex);
|
|
|
- // Matcher matcher=pattern.matcher(note);
|
|
|
- // StringBuffer stringBuffer=new StringBuffer();
|
|
|
- // stringBuffer.append(note);
|
|
|
- // String partOfNote = tmstruckLeaveFactoryResultMapper.querypartOfNote(orderNumber);
|
|
|
- // while (matcher.find()){
|
|
|
- // String group = matcher.group();
|
|
|
- // /*note=note.replace(group,partOfNote);*/
|
|
|
- // note=matcher.replaceAll(partOfNote);
|
|
|
- // }
|
|
|
- //
|
|
|
- // }else {
|
|
|
- // map.put("note","");
|
|
|
- // }
|
|
|
- //}
|
|
|
map.put("orderNumber",orderNumber);
|
|
|
if(map !=null){
|
|
|
List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
|
|
|
@@ -148,7 +125,7 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
|
|
|
try {
|
|
|
List<Map<String,Object>> deleteList= new ArrayList();
|
|
|
for(Map<String,Object> lastMap : deliveryOrderMaterialList) {
|
|
|
- if(!(lastMap.get("netWeightTime") != null && !"".equals(lastMap.get("netWeightTime")))){
|
|
|
+ if(!(lastMap.get("materialWeight") != null && !"".equals(lastMap.get("materialWeight")))){
|
|
|
deleteList.add(lastMap);
|
|
|
}
|
|
|
}
|
luobang