修改

src/main/java/com/steerinfo/dil/controller/TmstruckSelfMachineController.java

@@ -65,7 +65,7 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
         Map<String,Object> bigDecimal=new HashMap<>();
         bigDecimal.put("printnumber",0);
         Map<String,Object> bigDecimal1 = tmstruckSelfMachineService.queryNumber(orderNumber);
-        if(DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > 5) {
+        if(bigDecimal1 != null && DataChange.dataToBigDecimal(bigDecimal1.get("printnumber")).intValue() > 5) {
             bigDecimal.put("printnumber",1);
         }
         return bigDecimal;

src/main/java/com/steerinfo/dil/service/impl/TmstruckSelfMachineService.java

@@ -56,28 +56,28 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
             //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","");
-                }
-            }
+            //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);
@@ -91,9 +91,22 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
                     //判断是实重还是理重的标志
                     BigDecimal isPoundSale = (BigDecimal) map1.get("isPoundSale");
                     //判断是否为盘螺materialName.contains("盘螺")||materialName.contains("盘元")
+                    //根据运输订单号查找实绩重量
+                    List<Map<String, Object>> netWeightlist = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
+                    for (Map<String, Object> stringObjectMap : netWeightlist) {
+                        BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
+                        if(materialid1 !=null&&!("".equals(materialid1))){
+                            if (materialid.compareTo(materialid1) == 0) {
+                                BigDecimal nowNetWeight = (BigDecimal) stringObjectMap.get("nowNetWeight");
+                                if (nowNetWeight != null) {
+                                    map1.put("netWeightTime",stringObjectMap.get("netWeightTime"));
+                                }
+                            }
+                        }else {
+                            map1.put("netWeightTime", "");
+                        }
+                    }
                     if (isPoundSale !=null && isPoundSale.compareTo(BigDecimal.valueOf(0))==0){
-                        //根据运输订单号查找实绩重量
-                        List<Map<String, Object>> netWeightlist = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
                         for (Map<String, Object> stringObjectMap : netWeightlist) {
                             BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
                             if(materialid1 !=null&&!("".equals(materialid1))){

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1087,13 +1087,15 @@
         rm.material_specification "materialSpe",
         rm.material_model "materialModel",
         rm.material_id "materialId",
-        asm.is_pound_sale "isPoundSale"
+        asm.is_pound_sale "isPoundSale",
+        ASO.SALE_REMARK    "saleRemark"
         FROM
         omstruck_order oo
         LEFT JOIN rms_capacity rc ON rc.capacity_id = oo.capacity_id
         LEFT JOIN ams_sale_order_material asom ON asom.sale_order_material_id = oo.order_plan_id
         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL astm ON astm.sale_order_material_id = asom.sale_order_material_id
         LEFT JOIN AMS_SALE_MATERIAL asm ON asm.sale_material_id = astm.material_id
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
         LEFT JOIN rms_material rm ON rm.material_id = ASM.MATERIAL_ID
         LEFT JOIN rms_unit_of_measure ruom ON ruom.unit_of_measure_id = rm.unit_of_measure_id
         where oo.order_number = #{orderNumber}
@@ -1285,7 +1287,8 @@
    <!-- 获取物资实重-->
     <select id="getNetWeightByOrder" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight",
-        TWR.MATERIAL_ID AS "materialid"
+        TWR.MATERIAL_ID AS "materialid",
+        TWR.RESULT_GROSS_WEIGHT_TIME AS "netWeightTime"
         FROM OMSTRUCK_ORDER OO
         left join OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID=OO.ORDER_ID