|
@@ -69,13 +69,14 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
|
|
|
Map<String, Object> selectMap = new HashMap<>();
|
|
|
selectMap.put("foreignShipName", foreignShipName);
|
|
|
selectMap.put("materialId", new BigDecimal(materialId));
|
|
|
- List<DilBatch> dilBatchList = dilBatchMapper.selectByParameters(selectMap);
|
|
|
+ List<Map<String,Object>> dilBatchList = dilBatchMapper.selectBatchIdByName(selectMap);
|
|
|
DilBatch dilBatch = new DilBatch();
|
|
|
|
|
|
|
|
|
if (dilBatchList != null && dilBatchList.size() != 0) {
|
|
|
- dilBatch = dilBatchList.get(0);
|
|
|
- amsshipCargoTransferResult.setBatchId(dilBatch.getBatchId());
|
|
|
+ Map<String,Object> dilBatch1 = dilBatchList.get(0);
|
|
|
+ BigDecimal batchId =DataChange.dataToBigDecimal(dilBatch1.get("batchId"));
|
|
|
+ amsshipCargoTransferResult.setBatchId(batchId);
|
|
|
}
|
|
|
|
|
|
else {
|
|
@@ -92,7 +93,6 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
|
|
|
dilBatch.setInsertUsername("admin");
|
|
|
dilBatchMapper.insertSelective(dilBatch);
|
|
|
}
|
|
|
-
|
|
|
|
|
|
if (batchIdByMaterialId == null) {
|
|
|
|
|
@@ -197,6 +197,44 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
|
|
|
return amsshipCargoTransferResultMapper.selectShipperName(map);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public int update(Map<String, Object> map) {
|
|
|
+
|
|
|
+ List<Map<String, Object>> mapList=null;
|
|
|
+ AmsshipCargoTransferResult amsshipCargoTransferResult=new AmsshipCargoTransferResult();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ amsshipCargoTransferResult.setCargoTransferResultId(DataChange.dataToBigDecimal(map.get("cargoTransferResultId")));
|
|
|
+ amsshipCargoTransferResult.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
|
|
|
+ if (map.get("resultMemo")!=null) {
|
|
|
+ amsshipCargoTransferResult.setResultMemo((String) map.get("resultMemo"));
|
|
|
+ }
|
|
|
+ amsshipCargoTransferResult.setResultContactPerson((String) map.get("resultContactPerson"));
|
|
|
+ amsshipCargoTransferResult.setResultNumberOfLoans(DataChange.dataToBigDecimal(map.get("resultNumberOfLoans")));
|
|
|
+ amsshipCargoTransferResult.setResultTelephoneFax((String) map.get("resultTelephoneFax"));
|
|
|
+ if (map.get("resultFreignForwardingInfo")!=null) {
|
|
|
+ amsshipCargoTransferResult.setResultFreightForwardingInfo((String) map.get("resultFreignForwardingInfo"));
|
|
|
+ }
|
|
|
+ int i = amsshipCargoTransferResultMapper.updateByPrimaryKeySelective(amsshipCargoTransferResult);
|
|
|
+ return i;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|