|
@@ -971,11 +971,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("contract_id", contractManagementInfo.getId()));
|
|
|
//查合同下的车牌号,出库只能查到未出库的
|
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
- .eq("contract_no", contractManagementInfo.getContractNo()).eq("tran_type", "1").eq("submit", "0")
|
|
|
+ .eq("contract_no", contractManagementInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
|
|
|
.last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
|
|
|
if (!CollectionUtils.isEmpty(tranCarInfoList)) {
|
|
|
contractManagementInfo.setTranCarInfoList(tranCarInfoList);
|
|
|
}
|
|
|
+ List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
+ .eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
+ .eq("fleet_flag", "1")
|
|
|
+ .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
|
|
|
+ if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
|
|
|
+ contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
|
|
|
+ }
|
|
|
//查船名
|
|
|
Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
|
|
|
shipListWrapper.eq("contract_no", contractManagementInfo.getContractNo())
|
|
@@ -1008,11 +1015,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
|
|
|
//查移库任务编号下的车牌号,移库出库只能查到未出库的
|
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
- .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("tran_type", "1").eq("submit", "0")
|
|
|
+ .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
|
|
|
.last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
|
|
|
if (!CollectionUtils.isEmpty(tranCarInfoList)) {
|
|
|
contractManagementInfo.setTranCarInfoList(tranCarInfoList);
|
|
|
}
|
|
|
+ List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
+ .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
|
|
|
+ .eq("fleet_flag", "1")
|
|
|
+ .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
|
|
|
+ if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
|
|
|
+ contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
|
|
|
+ }
|
|
|
//查船名
|
|
|
Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
|
|
|
shipListWrapper.eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
|
|
@@ -2652,10 +2666,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(37);
|
|
|
- cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
|
|
|
+ if(exportVView.getPureWeightPrice() == null){
|
|
|
+ cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
|
|
|
+ }else {
|
|
|
+ cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
|
|
|
+ }
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(38);
|
|
|
- cell.setCellValue(editFloat(exportVView.getPureWeight()));
|
|
|
+ if(exportVView.getPureWeight() == null){
|
|
|
+ cell.setCellValue(editFloat(exportVView.getPureWeight()));
|
|
|
+ }else {
|
|
|
+ cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
|
|
|
+ }
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(39);
|
|
|
cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
|
|
@@ -3505,10 +3527,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(37);
|
|
|
- cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
|
|
|
+ if(exportVView.getPureWeightPrice() == null){
|
|
|
+ cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
|
|
|
+ }else {
|
|
|
+ cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
|
|
|
+ }
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(38);
|
|
|
- cell.setCellValue(editFloat(exportVView.getPureWeight()));
|
|
|
+ if(exportVView.getPureWeight() == null){
|
|
|
+ cell.setCellValue(editFloat(exportVView.getPureWeight()));
|
|
|
+ }else {
|
|
|
+ cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
|
|
|
+ }
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowx.createCell(39);
|
|
|
cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
|