hucc

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

@@ -55,13 +55,9 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
      */
     @PostMapping("/deleteTruckPlan/{planId}")
     public RESTfulResult deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
-<<<<<<< HEAD
-        amstruckInwardPlanService.updatedeletedPlan(planId);
-        return success("删除成功");
-=======
         int result = amstruckInwardPlanService.deleteTruckPlan(planId);
         return success(result);
->>>>>>> ed833f0e7f7ecd154064af26d7c207cc12f23570
+
     }
     /**
      * 修改运输计划
@@ -138,8 +134,7 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         return success(data);
     }
 
-<<<<<<< HEAD
-=======
+
     /**
      * 承运商下拉
      * @return
@@ -149,5 +144,4 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amstruckInwardPlanService.getCarrierList();
         return success(mapList);
     }
->>>>>>> ed833f0e7f7ecd154064af26d7c207cc12f23570
 }

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

@@ -578,6 +578,7 @@
         DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
         AIP.PLAN_NUMBER AS "planNumber",
         RCA.CARRIER_NAME AS "carrierName",
+        RCA.CARRIER_ID AS "carrierId",
         AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIP.PLAN_ISSUE_TIME AS "planIssueTime",
@@ -585,6 +586,7 @@
         AIR.REQUIREMENT_TYPE AS "requirementType",
         RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
         ARM.MATERIAL_COUNT AS "materialNumber",
+        ARM.MATERIAL_WEIGHT AS "materialWeight",
         AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
         RW.WAREHOUSE_NAME AS "wareHouseName",
         AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",