From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 10 ++++++++++
src/main/webapp/warehouse_stock_mng.xhtml | 14 ++++++++------
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 2 ++
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 1 +
src/main/webapp/WEB-INF/test/test.properties | 7 ++++---
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 6c2b125..b4d60ae 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1563,6 +1563,7 @@
headerList.add("订单状态");
headerList.add("课题组");
headerList.add("课题组负责人");
+ headerList.add("到货时间");
HSSFWorkbook hssfWorkbook =exportExcelOrder(headerList, realDataList);
hssfWorkbook.write(out);
out.flush();
@@ -1628,6 +1629,7 @@
dataRow.createCell(13).setCellValue(dataList.get(i).getStatus()== null ? "": String.valueOf(dataList.get(i).getStatus().getText()));
dataRow.createCell(14).setCellValue(dataList.get(i).getProject()== null ? "": String.valueOf(dataList.get(i).getProject()));
dataRow.createCell(15).setCellValue(dataList.get(i).getProjectManage()== null ? "": String.valueOf(dataList.get(i).getProjectManage()));
+ dataRow.createCell(16).setCellValue(dataList.get(i).getArrivalTime()== null ? "": String.valueOf(dataList.get(i).getArrivalTime()));
}
return hssfWorkbook;
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index ad66500..38cef0d 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -466,4 +466,14 @@
<update id="updateByReId" parameterType="java.util.Map">
update ope_apply set reagent_id=#{newReId} where reagent_id=#{oldReId}
</update>
+
+ <update id="updateOpeApplyInfo" parameterType="java.util.Map">
+ update
+ ope_apply
+ set status = #{status},
+ arrival_time = #{arrivalTime},
+ consignee_id = #{consigneeId}
+ where valid_flag = 1
+ and id = #{applyId}
+ </update>
</mapper>
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index 853a862..a96607c 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -1,6 +1,7 @@
package com.nanometer.smartlab.service;
import com.nanometer.smartlab.entity.*;
+import com.nanometer.smartlab.exception.BusinessException;
import java.util.Date;
import java.util.LinkedHashMap;
diff --git a/src/main/webapp/WEB-INF/test/test.properties b/src/main/webapp/WEB-INF/test/test.properties
index 75c14a0..230532d 100644
--- a/src/main/webapp/WEB-INF/test/test.properties
+++ b/src/main/webapp/WEB-INF/test/test.properties
@@ -1,10 +1,11 @@
-jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mysql://139.196.181.203:3306/smartlabdb_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
jdbc.username=root
-jdbc.password=123456
+jdbc.password=GKHY@root20201!
+
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
institute.id = 2
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240
-institute.url = http://sinanoaq.com
+institute.url = http://sinanoaq.com:8050
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
alarm.url =
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index 6996f21..4673d4e 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -368,7 +368,7 @@
<p:panel styleClass="center-body">
- <p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
+ <p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
<p:commandButton value="入库" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.addInputStorageOrder}"
disabled="#{warehouseStockMngController.editFlag==0}"
@@ -448,17 +448,19 @@
<p:column headerText="订单状态">
<h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
</p:column>
- <p:column headerText="到货时间">
- <h:outputText value="#{row.arrivalTime}">
- <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
- </h:outputText>
- </p:column>
+
<p:column headerText="课题组">
<h:outputText value="#{row.project}" />
</p:column>
<p:column headerText="课题组负责人">
<h:outputText value="#{row.projectManage}" />
</p:column>
+
+ <p:column headerText="到货时间">
+ <h:outputText value="#{row.arrivalTime}">
+ <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
+ </h:outputText>
+ </p:column>
</p:dataTable>
</p:panel>
</h:form>
--
Gitblit v1.9.2