Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
mengjiao 10 months ago
parent 7d2ee34a17 02e833445a
commit d6953800b3
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
Unescape Escape View File

@ -82,14 +82,14 @@ public class QcCheckTaskIncomeController extends BaseController {
public TableDataInfo list(QcCheckTaskIncome qcCheckTaskIncome) { public TableDataInfo list(QcCheckTaskIncome qcCheckTaskIncome) {
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { /*if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) {
qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end
} }*/
// if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){ // if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){
// qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start // qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start
@ -110,14 +110,14 @@ public class QcCheckTaskIncomeController extends BaseController {
public void export(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) { public void export(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) {
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { /*if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) {
qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end
} }*/
// if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){ // if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){
// qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start // qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start

4
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java
Unescape Escape View File

@ -46,14 +46,14 @@ public class QcCheckTaskInventoryController extends BaseController {
public TableDataInfo list(QcCheckTaskInventory qcCheckTaskInventory) { public TableDataInfo list(QcCheckTaskInventory qcCheckTaskInventory) {
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if (StringUtils.isEmpty(qcCheckTaskInventory.getIncomeTimeStart())) { /*if (StringUtils.isEmpty(qcCheckTaskInventory.getIncomeTimeStart())) {
qcCheckTaskInventory.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start qcCheckTaskInventory.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
qcCheckTaskInventory.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskInventory.setIncomeTimeEnd(dateEndStr);//end
} }*/
startPage(); startPage();
List<QcCheckTaskInventory> list = qcCheckTaskInventoryService.selectQcCheckTaskInventoryList(qcCheckTaskInventory); List<QcCheckTaskInventory> list = qcCheckTaskInventoryService.selectQcCheckTaskInventoryList(qcCheckTaskInventory);
return getDataTable(list); return getDataTable(list);

4
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskMarketController.java
Unescape Escape View File

@ -39,14 +39,14 @@ public class QcCheckTaskMarketController extends BaseController {
public TableDataInfo list(QcCheckTaskMarket qcCheckTaskMarket) { public TableDataInfo list(QcCheckTaskMarket qcCheckTaskMarket) {
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if (StringUtils.isEmpty(qcCheckTaskMarket.getIncomeTimeStart())) { /*if (StringUtils.isEmpty(qcCheckTaskMarket.getIncomeTimeStart())) {
qcCheckTaskMarket.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start qcCheckTaskMarket.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
qcCheckTaskMarket.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskMarket.setIncomeTimeEnd(dateEndStr);//end
} }*/
startPage(); startPage();
List<QcCheckTaskMarket> list = qcCheckTaskMarketService.selectQcCheckTaskMarketList(qcCheckTaskMarket); List<QcCheckTaskMarket> list = qcCheckTaskMarketService.selectQcCheckTaskMarketList(qcCheckTaskMarket);
return getDataTable(list); return getDataTable(list);

8
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java
Unescape Escape View File

@ -54,14 +54,14 @@ public class QcCheckTaskWarehousingController extends BaseController {
public TableDataInfo list(QcCheckTaskWarehousing qcCheckTaskWarehousing) { public TableDataInfo list(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
startPage(); startPage();
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ /*if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){
qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end
} }*/
List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing); List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing);
return getDataTable(list); return getDataTable(list);
} }
@ -74,14 +74,14 @@ public class QcCheckTaskWarehousingController extends BaseController {
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskWarehousing qcCheckTaskWarehousing) { public void export(HttpServletResponse response, QcCheckTaskWarehousing qcCheckTaskWarehousing) {
//默认时间范围T 00:00:00~T+1 00:00:00 //默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ /*if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){
qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now(); LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1); LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end
} }*/
List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing); List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing);
ExcelUtil<QcCheckTaskWarehousing> util = new ExcelUtil<QcCheckTaskWarehousing>(QcCheckTaskWarehousing.class); ExcelUtil<QcCheckTaskWarehousing> util = new ExcelUtil<QcCheckTaskWarehousing>(QcCheckTaskWarehousing.class);
util.exportExcel(response, list, "成品入库检验任务数据"); util.exportExcel(response, list, "成品入库检验任务数据");

2
op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
Unescape Escape View File

@ -103,7 +103,7 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
sysDatasource.setUrl(mysqlPrev + sysDatasource.getIpPort().split("/")[0] sysDatasource.setUrl(mysqlPrev + sysDatasource.getIpPort().split("/")[0]
+ mysqlAffter + sysDatasource.getIpPort().split("/")[1]); + mysqlAffter + sysDatasource.getIpPort().split("/")[1]);
} }
if (sysDatasource.getDeptId() != null) { if (sysDatasource.getDeptId() != null && StringUtils.isEmpty(sysDatasource.getPoolName())) {
sysDatasource.setPoolName(poolNamePrev + "_" + sysDatasource.getDeptId()); sysDatasource.setPoolName(poolNamePrev + "_" + sysDatasource.getDeptId());

Write Preview
Loading…
Cancel
Save