|
|
|
@ -33,6 +33,7 @@ import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.utils.YozoUtils;
|
|
|
|
|
import jnpf.vehicle.entity.VehicleEntity;
|
|
|
|
|
import jnpf.vehicle.service.VehicleService;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
|
|
|
import org.bytedeco.opencv.presets.opencv_core;
|
|
|
|
|
import org.springframework.http.MediaType;
|
|
|
|
@ -127,66 +128,43 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
TradeuploadCrForm tradeuploadCrForm = new TradeuploadCrForm();
|
|
|
|
|
String result = VatInvoice.weightNote(file);
|
|
|
|
|
// Map<String,Object> map = JsonUtil.stringToMap(result);
|
|
|
|
|
JSONObject jsonObject = JSON.parseObject(result);
|
|
|
|
|
UploaderVO vo = uploaderVO(file, type);
|
|
|
|
|
JSONArray jsonArray = jsonObject.getJSONArray("words_result");
|
|
|
|
|
JSONObject object = jsonArray.getJSONObject(0);
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>();
|
|
|
|
|
for (int i = 0;i<object.size();i++) {
|
|
|
|
|
// JSONObject object = jsonArray.getJSONObject(i);
|
|
|
|
|
JSONArray array = new JSONArray();
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
array = object.getJSONArray("TareWeight");
|
|
|
|
|
}else if(i == 1){
|
|
|
|
|
array = object.getJSONArray("CrossWeight");
|
|
|
|
|
}else if(i == 2){
|
|
|
|
|
array = object.getJSONArray("PlateNum");
|
|
|
|
|
}else if (i == 3){
|
|
|
|
|
array = object.getJSONArray("SendingCompany");
|
|
|
|
|
}else if (i == 4){
|
|
|
|
|
array = object.getJSONArray("DeliveryNumber");
|
|
|
|
|
}else if (i == 5){
|
|
|
|
|
array = object.getJSONArray("ReceivingCompany");
|
|
|
|
|
}else if (i == 6){
|
|
|
|
|
array = object.getJSONArray("PrintTime");
|
|
|
|
|
}else if (i == 7){
|
|
|
|
|
array = object.getJSONArray("NetWeight");
|
|
|
|
|
}
|
|
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
|
|
if(array != null && array.size() > 0){
|
|
|
|
|
JSONObject object1 = array.getJSONObject(0);
|
|
|
|
|
params = JSONObject.parseObject(object1.toJSONString(), new TypeReference<Map<String, String>>() {
|
|
|
|
|
});
|
|
|
|
|
String TareWeight = "";
|
|
|
|
|
String CrossWeight = "";
|
|
|
|
|
String PlateNum = "";
|
|
|
|
|
String SendingCompany = "";
|
|
|
|
|
String DeliveryNumber = "";
|
|
|
|
|
String ReceivingCompany = "";
|
|
|
|
|
String PrintTime = "";
|
|
|
|
|
String NetWeight = "";
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("TareWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("TareWeight").size()>0) {
|
|
|
|
|
TareWeight = jsonArray.getJSONObject(0).getJSONArray("TareWeight").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
map1.put("TareWeight", params.get("word"));
|
|
|
|
|
}else if (i == 1){
|
|
|
|
|
map1.put("CrossWeight", params.get("word"));
|
|
|
|
|
}else if (i == 2){
|
|
|
|
|
map1.put("PlateNum", params.get("word"));
|
|
|
|
|
}else if (i == 3){
|
|
|
|
|
map1.put("SendingCompany", params.get("word"));
|
|
|
|
|
}else if (i == 4){
|
|
|
|
|
map1.put("DeliveryNumber", params.get("word"));
|
|
|
|
|
}else if (i == 5){
|
|
|
|
|
map1.put("ReceivingCompany", params.get("word"));
|
|
|
|
|
}else if (i == 6){
|
|
|
|
|
map1.put("PrintTime", params.get("word"));
|
|
|
|
|
}else if (i == 7){
|
|
|
|
|
map1.put("NetWeight", params.get("word"));
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("CrossWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("CrossWeight").size()>0) {
|
|
|
|
|
CrossWeight = jsonArray.getJSONObject(0).getJSONArray("CrossWeight").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("PlateNum")!=null && jsonArray.getJSONObject(0).getJSONArray("PlateNum").size()>0) {
|
|
|
|
|
PlateNum = jsonArray.getJSONObject(0).getJSONArray("PlateNum").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// List<VehicleEntity> list = JSONObject.parseArray(array.toJSONString(),VehicleEntity.class);
|
|
|
|
|
// JSONObject jsonObject = (JSONObject) map.get("words_result");
|
|
|
|
|
// JSONArray jsonArray = jsonObject.getJSONArray("words_result");
|
|
|
|
|
// List<VehicleEntity> list = JSONObject.parseArray(jsonArray.toJSONString(),VehicleEntity.class);
|
|
|
|
|
if(map1.size()>0) {
|
|
|
|
|
if (map1.get("ReceivingCompany")!= null) {
|
|
|
|
|
tradeuploadCrForm.setCustomerId(String.valueOf(map1.get("ReceivingCompany")));
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("SendingCompany")!=null && jsonArray.getJSONObject(0).getJSONArray("SendingCompany").size()>0) {
|
|
|
|
|
SendingCompany = jsonArray.getJSONObject(0).getJSONArray("SendingCompany").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber")!=null && jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber").size()>0) {
|
|
|
|
|
DeliveryNumber = jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany")!=null && jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany").size()>0) {
|
|
|
|
|
ReceivingCompany = jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("PrintTime")!=null && jsonArray.getJSONObject(0).getJSONArray("PrintTime").size()>0) {
|
|
|
|
|
PrintTime = jsonArray.getJSONObject(0).getJSONArray("PrintTime").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (jsonArray.getJSONObject(0).getJSONArray("NetWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("NetWeight").size()>0) {
|
|
|
|
|
NetWeight = jsonArray.getJSONObject(0).getJSONArray("NetWeight").getJSONObject(0).getString("word");
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(ReceivingCompany)) {
|
|
|
|
|
tradeuploadCrForm.setCustomerId(ReceivingCompany);
|
|
|
|
|
QueryWrapper<CustomerEntity> customerQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
|
|
|
|
|
CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
|
|
|
|
@ -206,12 +184,11 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (map1.get("PlateNum")!= null) {
|
|
|
|
|
tradeuploadCrForm.setVehicleId(String.valueOf(map1.get("PlateNum")));
|
|
|
|
|
tradeuploadCrForm.setVehicleName(String.valueOf(map1.get("PlateNum")));
|
|
|
|
|
if (StringUtils.isNotEmpty(PlateNum)) {
|
|
|
|
|
tradeuploadCrForm.setVehicleId(PlateNum);
|
|
|
|
|
tradeuploadCrForm.setVehicleName(PlateNum);
|
|
|
|
|
QueryWrapper<VehicleEntity> vehicleQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, map1.get("PlateNum"));
|
|
|
|
|
//vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, "鲁FEV620");
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, PlateNum);
|
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
|
|
|
|
|
if (vehicleEntity != null) {
|
|
|
|
|
tradeuploadCrForm.setVehicleId(vehicleEntity.getId());
|
|
|
|
@ -219,41 +196,158 @@ public class TradeuploadController {
|
|
|
|
|
tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (map1.get("PrintTime") == null) {
|
|
|
|
|
tradeuploadCrForm.setPoundDate(new Date());
|
|
|
|
|
}
|
|
|
|
|
String printTime = String.valueOf(map1.get("PrintTime"));
|
|
|
|
|
//String sdf = "yyyy-MM-dd" ;
|
|
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
|
if(printTime != null && printTime.length() == 10){
|
|
|
|
|
tradeuploadCrForm.setPoundDate(sdf.parse(printTime));
|
|
|
|
|
if(StringUtils.isNotEmpty(PrintTime) && PrintTime.length() == 10){
|
|
|
|
|
tradeuploadCrForm.setPoundDate(sdf.parse(PrintTime));
|
|
|
|
|
}else{
|
|
|
|
|
tradeuploadCrForm.setPoundDate(new Date());
|
|
|
|
|
}
|
|
|
|
|
if (map1.get("DeliveryNumber") == null) {
|
|
|
|
|
if (StringUtils.isEmpty(DeliveryNumber)) {
|
|
|
|
|
tradeuploadCrForm.setPoundlistNo(String.valueOf(new Date()));
|
|
|
|
|
}else {
|
|
|
|
|
tradeuploadCrForm.setPoundlistNo(DeliveryNumber);
|
|
|
|
|
}
|
|
|
|
|
tradeuploadCrForm.setPoundlistNo(String.valueOf(map1.get("DeliveryNumber")));
|
|
|
|
|
if (map1.get("TareWeight")!=null) {
|
|
|
|
|
tradeuploadCrForm.setTareWeight(String.valueOf(map1.get("TareWeight")));
|
|
|
|
|
if (StringUtils.isNotEmpty(TareWeight)) {
|
|
|
|
|
tradeuploadCrForm.setTareWeight(TareWeight);
|
|
|
|
|
}
|
|
|
|
|
if (map1.get("CrossWeight")!=null) {
|
|
|
|
|
tradeuploadCrForm.setGrossWeight(String.valueOf(map1.get("CrossWeight")));
|
|
|
|
|
if (StringUtils.isNotEmpty(CrossWeight)) {
|
|
|
|
|
tradeuploadCrForm.setGrossWeight(CrossWeight);
|
|
|
|
|
}
|
|
|
|
|
if (map1.get("NetWeight") == null) {
|
|
|
|
|
if (StringUtils.isEmpty(NetWeight)) {
|
|
|
|
|
tradeuploadCrForm.setBuckleWeight("0");
|
|
|
|
|
}else {
|
|
|
|
|
tradeuploadCrForm.setBuckleWeight(NetWeight);
|
|
|
|
|
}
|
|
|
|
|
tradeuploadCrForm.setBuckleWeight(String.valueOf(map1.get("NetWeight")));
|
|
|
|
|
if (map1.get("NetWeight") != null) {
|
|
|
|
|
tradeuploadCrForm.setNetWeight(String.valueOf(map1.get("NetWeight")));
|
|
|
|
|
if (StringUtils.isNotEmpty(NetWeight)) {
|
|
|
|
|
tradeuploadCrForm.setNetWeight(NetWeight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
tradeuploadCrForm.setBusinessId(userInfo.getId());
|
|
|
|
|
tradeuploadCrForm.setBusinessName(userInfo.getUserName());
|
|
|
|
|
}
|
|
|
|
|
tradeuploadCrForm.setVo(vo);
|
|
|
|
|
return ActionResult.success(tradeuploadCrForm);
|
|
|
|
|
// JSONObject object = jsonArray.getJSONObject(0);
|
|
|
|
|
// Map<String, Object> map1 = new HashMap<>();
|
|
|
|
|
// for (int i = 0;i<object.size();i++) {
|
|
|
|
|
//// JSONObject object = jsonArray.getJSONObject(i);
|
|
|
|
|
// JSONArray array = new JSONArray();
|
|
|
|
|
// if (i == 0) {
|
|
|
|
|
// array = object.getJSONArray("TareWeight");
|
|
|
|
|
// }else if(i == 1){
|
|
|
|
|
// array = object.getJSONArray("CrossWeight");
|
|
|
|
|
// }else if(i == 2){
|
|
|
|
|
// array = object.getJSONArray("PlateNum");
|
|
|
|
|
// }else if (i == 3){
|
|
|
|
|
// array = object.getJSONArray("SendingCompany");
|
|
|
|
|
// }else if (i == 4){
|
|
|
|
|
// array = object.getJSONArray("DeliveryNumber");
|
|
|
|
|
// }else if (i == 5){
|
|
|
|
|
// array = object.getJSONArray("ReceivingCompany");
|
|
|
|
|
// }else if (i == 6){
|
|
|
|
|
// array = object.getJSONArray("PrintTime");
|
|
|
|
|
// }else if (i == 7){
|
|
|
|
|
// array = object.getJSONArray("NetWeight");
|
|
|
|
|
// }
|
|
|
|
|
// Map<String, String> params = new HashMap<>();
|
|
|
|
|
// if(array != null && array.size() > 0){
|
|
|
|
|
// JSONObject object1 = array.getJSONObject(0);
|
|
|
|
|
// params = JSONObject.parseObject(object1.toJSONString(), new TypeReference<Map<String, String>>() {
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if (i == 0) {
|
|
|
|
|
// map1.put("TareWeight", params.get("word"));
|
|
|
|
|
// }else if (i == 1){
|
|
|
|
|
// map1.put("CrossWeight", params.get("word"));
|
|
|
|
|
// }else if (i == 2){
|
|
|
|
|
// map1.put("PlateNum", params.get("word"));
|
|
|
|
|
// }else if (i == 3){
|
|
|
|
|
// map1.put("SendingCompany", params.get("word"));
|
|
|
|
|
// }else if (i == 4){
|
|
|
|
|
// map1.put("DeliveryNumber", params.get("word"));
|
|
|
|
|
// }else if (i == 5){
|
|
|
|
|
// map1.put("ReceivingCompany", params.get("word"));
|
|
|
|
|
// }else if (i == 6){
|
|
|
|
|
// map1.put("PrintTime", params.get("word"));
|
|
|
|
|
// }else if (i == 7){
|
|
|
|
|
// map1.put("NetWeight", params.get("word"));
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// List<VehicleEntity> list = JSONObject.parseArray(array.toJSONString(),VehicleEntity.class);
|
|
|
|
|
// JSONObject jsonObject = (JSONObject) map.get("words_result");
|
|
|
|
|
// JSONArray jsonArray = jsonObject.getJSONArray("words_result");
|
|
|
|
|
// List<VehicleEntity> list = JSONObject.parseArray(jsonArray.toJSONString(),VehicleEntity.class);
|
|
|
|
|
// if(map1.size()>0) {
|
|
|
|
|
// if (map1.get("ReceivingCompany")!= null) {
|
|
|
|
|
// tradeuploadCrForm.setCustomerId(String.valueOf(map1.get("ReceivingCompany")));
|
|
|
|
|
// QueryWrapper<CustomerEntity> customerQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
// customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
|
|
|
|
|
// CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
|
|
|
|
|
// if (customerEntity != null) {
|
|
|
|
|
// tradeuploadCrForm.setCustomerId(customerEntity.getId());
|
|
|
|
|
// tradeuploadCrForm.setCustomerName(customerEntity.getSupplierNm());
|
|
|
|
|
// tradeuploadCrForm.setClientId(customerEntity.getId());
|
|
|
|
|
// QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
// queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
|
|
|
|
|
// queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
|
|
|
|
|
// queryWrapper.lambda().eq(ContractFileEntity::getStatus, "1");
|
|
|
|
|
// queryWrapper.lambda().orderByAsc(ContractFileEntity::getBidOpeningDate).last("limit 1");
|
|
|
|
|
// ContractFileEntity contractFileEntity = contractFileService.getOne(queryWrapper);
|
|
|
|
|
// if (contractFileEntity != null) {
|
|
|
|
|
// tradeuploadCrForm.setSalesId(contractFileEntity.getId());
|
|
|
|
|
// tradeuploadCrForm.setSalesName(contractFileEntity.getContractName());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (map1.get("PlateNum")!= null) {
|
|
|
|
|
// tradeuploadCrForm.setVehicleId(String.valueOf(map1.get("PlateNum")));
|
|
|
|
|
// tradeuploadCrForm.setVehicleName(String.valueOf(map1.get("PlateNum")));
|
|
|
|
|
// QueryWrapper<VehicleEntity> vehicleQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
// vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, map1.get("PlateNum"));
|
|
|
|
|
// //vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, "鲁FEV620");
|
|
|
|
|
// VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
|
|
|
|
|
// if (vehicleEntity != null) {
|
|
|
|
|
// tradeuploadCrForm.setVehicleId(vehicleEntity.getId());
|
|
|
|
|
// tradeuploadCrForm.setVehicleName(vehicleEntity.getTicketno());
|
|
|
|
|
// tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (map1.get("PrintTime") == null) {
|
|
|
|
|
// tradeuploadCrForm.setPoundDate(new Date());
|
|
|
|
|
// }
|
|
|
|
|
// String printTime = String.valueOf(map1.get("PrintTime"));
|
|
|
|
|
// //String sdf = "yyyy-MM-dd" ;
|
|
|
|
|
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
|
// if(printTime != null && printTime.length() == 10){
|
|
|
|
|
// tradeuploadCrForm.setPoundDate(sdf.parse(printTime));
|
|
|
|
|
// }else{
|
|
|
|
|
// tradeuploadCrForm.setPoundDate(new Date());
|
|
|
|
|
// }
|
|
|
|
|
// if (map1.get("DeliveryNumber") == null) {
|
|
|
|
|
// tradeuploadCrForm.setPoundlistNo(String.valueOf(new Date()));
|
|
|
|
|
// }
|
|
|
|
|
// tradeuploadCrForm.setPoundlistNo(String.valueOf(map1.get("DeliveryNumber")));
|
|
|
|
|
// if (map1.get("TareWeight")!=null) {
|
|
|
|
|
// tradeuploadCrForm.setTareWeight(String.valueOf(map1.get("TareWeight")));
|
|
|
|
|
// }
|
|
|
|
|
// if (map1.get("CrossWeight")!=null) {
|
|
|
|
|
// tradeuploadCrForm.setGrossWeight(String.valueOf(map1.get("CrossWeight")));
|
|
|
|
|
// }
|
|
|
|
|
// if (map1.get("NetWeight") == null) {
|
|
|
|
|
// tradeuploadCrForm.setBuckleWeight("0");
|
|
|
|
|
// }
|
|
|
|
|
// tradeuploadCrForm.setBuckleWeight(String.valueOf(map1.get("NetWeight")));
|
|
|
|
|
// if (map1.get("NetWeight") != null) {
|
|
|
|
|
// tradeuploadCrForm.setNetWeight(String.valueOf(map1.get("NetWeight")));
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// UserInfo userInfo = userProvider.get();
|
|
|
|
|
// tradeuploadCrForm.setBusinessId(userInfo.getId());
|
|
|
|
|
// tradeuploadCrForm.setBusinessName(userInfo.getUserName());
|
|
|
|
|
// }
|
|
|
|
|
// return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|