修改

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

@@ -173,6 +173,11 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if(bmstruckDetailsOrderMapper.getIsHaveDetailsOrder(weightTaskResultId) > 0 ){
                 continue;
             }
+            BigDecimal netWeightIsNull = bmstruckDetailsOrderMapper.getNetWeight(weightTaskResultId);
+            if (netWeightIsNull == null) {
+                System.out.println("没有计量实绩,不生成结算数据:" + orderId);
+                continue;
+            }
             //BigDecimal detailsAmountOld=new BigDecimal(0);
             try {
                 BigDecimal  detailsAmountOld = generateTruckFeesNew(orderId, weightTaskResultId);
@@ -1112,17 +1117,17 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if (priceIdInt!=null&&priceIdInt.compareTo(BigDecimal.ZERO)!=0){
                 break;
             }else {
-                //新增单价
-                BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-                BigDecimal omsTruckOrderPriceId = bmstruckDetailsOrderMapper.getOmsTruckOrderPriceId(orderId);
-                Map<String,Object> map1=new HashMap<>();
-                map1.put("orderId",orderId);
-                map1.put("priceId",omsTruckOrderPriceId);
-                try {
-                    amsFeign.copySteelPrice(map1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                ////新增单价
+                //BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+                //BigDecimal omsTruckOrderPriceId = bmstruckDetailsOrderMapper.getOmsTruckOrderPriceId(orderId);
+                //Map<String,Object> map1=new HashMap<>();
+                //map1.put("orderId",orderId);
+                //map1.put("priceId",omsTruckOrderPriceId);
+                //try {
+                //    amsFeign.copySteelPrice(map1);
+                //} catch (Exception e) {
+                //    e.printStackTrace();
+                //}
                 //单价的主键
                 //map1.put("priceId",bmstruckDetailsOrderMapper.selectMaxIdNew());
                 //map1.put("priceValue",map.get("priceValue"));

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

@@ -1631,6 +1631,7 @@
                      bdo.details_no     "detailsNo",
                      bdo.INSERT_TIME    "insertTime",
                      bdo.DETAILS_ID     "detailsId",
+                     AIR.INSERT_UPDATE_REMARK   "requirementRemark",
                      RCT.CAPACITY_TYPE_NAME  "capacityTypeName"
               from bmstruck_details_order bdo
                        left join OMSTRUCK_ORDER OO