Compare commits

..

No commits in common. "bac2dcec0daaf88ec315ff0938428297eb365d18" and "5edafc61499bcb2463fc3f0e82dbf09c3d18e60e" have entirely different histories.

5 changed files with 10 additions and 16 deletions

View File

@ -899,7 +899,6 @@ public class EstimateService {
// [4]. 견적서 복사 // [4]. 견적서 복사
estimateCopyRequest.setCopyObjectNo(objectRequest.getObjectNo()); estimateCopyRequest.setCopyObjectNo(objectRequest.getObjectNo());
estimateCopyRequest.setCopyPlanNo("1"); estimateCopyRequest.setCopyPlanNo("1");
estimateCopyRequest.setCopyReceiveUser(objectRequest.getReceiveUser()); //담당자
estimateMapper.insertEstimateCopy(estimateCopyRequest); estimateMapper.insertEstimateCopy(estimateCopyRequest);
estimateMapper.insertEstimateInfoCopy(estimateCopyRequest); estimateMapper.insertEstimateInfoCopy(estimateCopyRequest);
estimateMapper.insertCanvasPopupStatusCopy(estimateCopyRequest); estimateMapper.insertCanvasPopupStatusCopy(estimateCopyRequest);

View File

@ -51,7 +51,7 @@ file:
root.path: /home/development/public/files root.path: /home/development/public/files
ini.root.path: /home/development/public/files/NewEstimate ini.root.path: /home/development/public/files/NewEstimate
ini.base.filename: 料金シミュレーション.ini ini.base.filename: 料金シミュレーション.ini
ini.drawing.img.path: https://files.hanasys.jp/Drawing/dev ini.drawing.img.path: https://files.hanasys.jp/Drawing
front: front:
url: http://1.248.227.176:3000 url: http://1.248.227.176:3000

View File

@ -6,12 +6,12 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true # jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
username: pvDBuser
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
# jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
# password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
# username: pvDBuser # username: pvDBuser
# password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
username: pvDBuser
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool pool-name: Master-HikariPool
jackson: jackson:
@ -31,7 +31,7 @@ batch:
#QSP url 하나시스개발 #http://121.168.9.37:8080 #QSP url 하나시스개발 #http://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120 #QSP url interplug dev #http://1.248.227.176:8120
qsp: qsp:
url: https://jp.qsalesplatform.com url: http://121.168.9.37:8080
master-store-batch-url: /api/master/storeAdditionalInfo master-store-batch-url: /api/master/storeAdditionalInfo
master-material-batch-url: /api/master/materialList master-material-batch-url: /api/master/materialList
master-bom-batch-url: /api/master/bomList master-bom-batch-url: /api/master/bomList
@ -50,7 +50,7 @@ file:
root.path: /home/production/public/files root.path: /home/production/public/files
ini.root.path: /home/production/public/files/NewEstimate ini.root.path: /home/production/public/files/NewEstimate
ini.base.filename: 料金シミュレーション.ini ini.base.filename: 料金シミュレーション.ini
ini.drawing.img.path: https://files.hanasys.jp/Drawing/prd ini.drawing.img.path: https://files.hanasys.jp/Drawing
front: front:
url: https://hanasys.jp url: https://hanasys.jp

View File

@ -1180,7 +1180,7 @@
, P.SUPPORT_METHOD_ID , P.SUPPORT_METHOD_ID
, P.MODULE_MODEL , P.MODULE_MODEL
, GETDATE() AS DRAWING_ESTIMATE_CREATE_DATE , GETDATE() AS DRAWING_ESTIMATE_CREATE_DATE
, #{copyReceiveUser} AS CHARGER , P.CHARGER
, P.ESTIMATE_VALIDITY_TERM , P.ESTIMATE_VALIDITY_TERM
, P.DECISION_PLAN , P.DECISION_PLAN
, P.NUMBER , P.NUMBER

View File

@ -81,12 +81,7 @@
, B.ITEM_ID , B.ITEM_ID
, SUM(B.AMOUNT) AS AMOUNT , SUM(B.AMOUNT) AS AMOUNT
, B.ITEM_NO , B.ITEM_NO
, ISNULL((SUM(B.AMOUNT) * , ISNULL((SUM(B.AMOUNT) * TRY_CAST(MAX(B.SPECIFICATION) AS FLOAT)),0) AS TOT_SPECIFICATION /* 용량 */
CASE
WHEN ISNUMERIC(MAX(B.SPECIFICATION)) = 1 THEN CAST(MAX(B.SPECIFICATION) AS FLOAT)
ELSE NULL -- 또는 기본값 (예: 0)으로 대체할 수도 있음
END
),0) AS TOT_SPECIFICATION /* 용량 */
, MAX(C.ITEM_GROUP) AS ITEM_GROUP /* 추후 지붕재테이블로 봐야함. */ , MAX(C.ITEM_GROUP) AS ITEM_GROUP /* 추후 지붕재테이블로 봐야함. */
, MAX(D.TEMP_LOSS) AS TEMP_LOSS , MAX(D.TEMP_LOSS) AS TEMP_LOSS
, MAX(D.TEMP_COEFF ) AS TEMP_COEFF , MAX(D.TEMP_COEFF ) AS TEMP_COEFF