|
@@ -6,6 +6,7 @@ import com.steerinfo.dil.model.BmsshipDetailsOrder;
|
|
|
import com.steerinfo.dil.model.BmsshipDetailsStatement;
|
|
import com.steerinfo.dil.model.BmsshipDetailsStatement;
|
|
|
import com.steerinfo.dil.model.BmsshipStatement;
|
|
import com.steerinfo.dil.model.BmsshipStatement;
|
|
|
import com.steerinfo.dil.service.IBmsshipStatementService;
|
|
import com.steerinfo.dil.service.IBmsshipStatementService;
|
|
|
|
|
+import com.steerinfo.dil.util.EASUtil;
|
|
|
import com.steerinfo.dil.util.NoUtil;
|
|
import com.steerinfo.dil.util.NoUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -36,6 +37,8 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
|
|
|
NoUtil noUtil;
|
|
NoUtil noUtil;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
JoinApiFeign joinApiFeign;
|
|
JoinApiFeign joinApiFeign;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ EASUtil easUtil;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 生成水运费账单
|
|
* 生成水运费账单
|
|
@@ -91,9 +94,14 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
|
|
|
bmsshipStatement.setStatementType("水运费");
|
|
bmsshipStatement.setStatementType("水运费");
|
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
|
// 调用金蝶接口
|
|
// 调用金蝶接口
|
|
|
- List<Map<String,Object>> mapList = joinApiFeign.getPurchaseShipDetails(statementId.intValue());
|
|
|
|
|
- Map<String,Object> mapValue = joinApiFeign.getShipStatement(statementId.intValue());
|
|
|
|
|
- mapValue.put("mapList",mapList);
|
|
|
|
|
|
|
+ List<Map<String,Object>> entries = joinApiFeign.getPurchaseShipDetails(statementId.intValue());
|
|
|
|
|
+ Map<String,Object> head = joinApiFeign.getShipStatement(statementId.intValue());
|
|
|
|
|
+ Map<String,Object> input = new HashMap<>();
|
|
|
|
|
+ input.put("head",head);
|
|
|
|
|
+ input.put("entries",entries);
|
|
|
|
|
+ Map<String, Object> totalMap = easUtil.getTotalMap();
|
|
|
|
|
+ totalMap.put("input",input);
|
|
|
|
|
+ joinApiFeign.WSFaceWay(totalMap);
|
|
|
return code;
|
|
return code;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -127,6 +135,11 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
|
|
|
bmsshipStatement.setInsertUpdateRemark("无");
|
|
bmsshipStatement.setInsertUpdateRemark("无");
|
|
|
bmsshipStatement.setStatementShipperId(new BigDecimal(1));
|
|
bmsshipStatement.setStatementShipperId(new BigDecimal(1));
|
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
|
|
|
+ // 调用金蝶接口
|
|
|
|
|
+ Map<String, Object> totalMap = easUtil.getTotalMap();
|
|
|
|
|
+ Map<String, Object> input = joinApiFeign.getShipStatement(statementId.intValue());
|
|
|
|
|
+ totalMap.put("input",input);
|
|
|
|
|
+ joinApiFeign.WSFaceWay(totalMap);
|
|
|
return code;
|
|
return code;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -159,6 +172,11 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
|
|
|
bmsshipStatement.setUpdateUsername("admin");
|
|
bmsshipStatement.setUpdateUsername("admin");
|
|
|
bmsshipStatement.setInsertUpdateRemark("无");
|
|
bmsshipStatement.setInsertUpdateRemark("无");
|
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
int code = bmsshipStatementMapper.insertSelective(bmsshipStatement);
|
|
|
|
|
+ // 调用金蝶接口
|
|
|
|
|
+ Map<String, Object> totalMap = easUtil.getTotalMap();
|
|
|
|
|
+ Map<String, Object> input = joinApiFeign.getShipStatement(statementId.intValue());
|
|
|
|
|
+ totalMap.put("input",input);
|
|
|
|
|
+ joinApiFeign.WSFaceWay(totalMap);
|
|
|
return code;
|
|
return code;
|
|
|
}
|
|
}
|
|
|
|
|
|