修改

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

@@ -403,4 +403,16 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         }
         return failed("装货失败");
     }
+
+    @ApiOperation(value = "根据运输订单号修改装/卸点、卸货物资、装机备注等：后台管理")
+    @PostMapping("/selectLoadingIdRemark")
+    public RESTfulResult selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return success(tmstruckLoadResultService.selectLoadingIdRemark(map));
+    }
+
+    @ApiOperation(value = "根据运输订单号修改装/卸点、卸货物资、装机备注等：后台管理")
+    @PostMapping("/updateLoadingIdRemark")
+    public RESTfulResult updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return success(tmstruckLoadResultService.updateLoadingIdRemark(map));
+    }
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.java

@@ -140,6 +140,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     Map<String, Object> getLoadResultMap(BigDecimal resultTotalId);
 
-
+    //查询装卸信息
+    Map<String, Object> selectLoadingIdRemark(Map<String, Object> map);
 
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLoadResultService.java

@@ -90,4 +90,8 @@ public interface ITmstruckLoadResultService{
     //插入装货
     int addLoad1(Map<String,Object> map);
 
+    Map<String, Object> selectLoadingIdRemark(Map<String, Object> mapval);
+
+    int updateLoadingIdRemark(Map<String,Object> map);
+
 }

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

@@ -4,10 +4,7 @@ import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.*;
-import com.steerinfo.dil.model.TmstruckEnfactoryResult;
-import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
-import com.steerinfo.dil.model.TmstruckLoadResult;
-import com.steerinfo.dil.model.TmstruckWeightResult;
+import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -793,4 +790,29 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         }
         return 0;
     }
+
+    @Override
+    public Map<String, Object> selectLoadingIdRemark(Map<String, Object> map) {
+        //查询装卸货信息（装载机(CAPACITY_REMARK),修改备注(INSERT_UPDATE_REMARK)，装货点，卸货点，卸货物资）
+        return tmstruckLoadResultMapper.selectLoadingIdRemark(map);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateLoadingIdRemark(Map<String, Object> map) {
+        //更新装货
+        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("loadResultId")));
+        tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("loadingId")));
+        tmstruckLoadResult.setCapacityRemark((String)map.get("capacityRemark"));
+        tmstruckLoadResult.setInsertUpdateRemark((String)map.get("insertUpdateRemark"));
+        //更新卸货unloadResultId
+        TmstruckUnloadResult tmstruckUnloadResult=new TmstruckUnloadResult();
+        tmstruckUnloadResult.setResultId(DataChange.dataToBigDecimal(map.get("unloadResultId")));
+        tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("unloadingId")));
+        tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
+        return 0;
+    }
 }

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

@@ -1811,5 +1811,31 @@
            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
     WHERE	TLFR.RESULT_OUT_MODE = '未装货出厂' AND TTR.ORDER_ID = #{orderId}
   </select>
+  <select id="selectLoadingIdRemark" resultType="java.util.Map">
+    SELECT OO.ORDER_ID         "orderId",
+           OO.ORDER_NUMBER "orderNumber",
+           RC.CAPACITY_NUMBER   "capacityNumber",
+           TTR.RESULT_TOTAL_ID "resultTotalId",
+           TLR.RESULT_ID       "loadResultId",
+           TLR.LOADING_ID "loadingId",
+           RWL.WAREHOUSE_NAME "loadingName",
+           TLR.CAPACITY_REMARK "capacityRemark",
+           TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
+           TUR.RESULT_ID       "unloadResultId",
+           TUR.RESULT_UNLOAD_PLACE_ID "unloadingId",
+           RWU.WAREHOUSE_NAME "unloadingName",
+           TUR.MATERIAL_ID "materialId",
+           RM.MATERIAL_NAME "materialName"
+    FROM OMSTRUCK_ORDER OO
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+           LEFT JOIN TMSTRUCK_LOAD_RESULT TLR ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+           LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+           LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = TUR.MATERIAL_ID
+           LEFT JOIN RMS_WAREHOUSE RWL ON RWL.WAREHOUSE_ID = TLR.LOADING_ID
+           LEFT JOIN RMS_WAREHOUSE RWU ON RWU.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+    WHERE OO.ORDER_NUMBER = #{orderNumber}
+    FETCH NEXT 1 ROWS ONLY
+  </select>
 
 </mapper>