qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #422

Merged
ysCha merged 2 commits from dev into dev-deploy 2026-03-13 15:45:15 +09:00
Conversation 0 Commits 2 Files Changed 2 +64 -77
2 changed files with 64 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/interplug/qcast/batch/JobLauncherController.java
View File

@ -153,7 +153,7 @@ public class JobLauncherController {
* *
*/ */
@Scheduled(cron = "0 30 02 * * *") @Scheduled(cron = "0 50 04 * * *")
public String materialJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { public String materialJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException {
return executeScheduledJob("materialJob"); return executeScheduledJob("materialJob");
@ -165,7 +165,7 @@ public class JobLauncherController {
* *
*/ */
@Scheduled(cron = "0 40 02 * * *") @Scheduled(cron = "0 20 05 * * *")
public String bomJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { public String bomJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException {
return executeScheduledJob("bomJob"); return executeScheduledJob("bomJob");

13
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -97,7 +97,6 @@
, SS3.ADDRESS AS ADDRESS3 , SS3.ADDRESS AS ADDRESS3
, SS3.TEL AS TEL3 , SS3.TEL AS TEL3
, SS3.FAX AS FAX3 , SS3.FAX AS FAX3
/*
, CASE WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = '' THEN Z.ZIP_NO2 , CASE WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = '' THEN Z.ZIP_NO2
WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO
ELSE Z.ZIP_NO1 END AS ZIP_NO ELSE Z.ZIP_NO1 END AS ZIP_NO
@ -110,16 +109,6 @@
, CASE WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = '' THEN Z.FAX2 , CASE WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = '' THEN Z.FAX2
WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX WHEN Z.CREATE_SALE_STORE_ID = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX
ELSE Z.FAX1 END AS FAX ELSE Z.FAX1 END AS FAX
*/
,(SELECT
SUBSTRING(MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3) + 1,
CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) - CHARINDEX('〒', MCL.REF_CHR3) - 1) FROM M_COMM_L MCL WHERE MCL.HEAD_CD = '103200' AND MCL.CODE = Z.BUSINESS_TEAM_CD ) as ZIP_NO
,(SELECT
LTRIM(SUBSTRING(MCL.REF_CHR3,
CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) + 1,
LEN(MCL.REF_CHR3))) FROM M_COMM_L MCL WHERE MCL.HEAD_CD = '103200' AND MCL.CODE = Z.BUSINESS_TEAM_CD ) as ADDRESS
,(SELECT MCL.REF_CHR4 FROM M_COMM_L MCL WHERE MCL.HEAD_CD = '103200' AND MCL.CODE = Z.BUSINESS_TEAM_CD ) AS TEL
,(SELECT MCL.REF_CHR5 FROM M_COMM_L MCL WHERE MCL.HEAD_CD = '103200' AND MCL.CODE = Z.BUSINESS_TEAM_CD ) AS FAX
FROM ( FROM (
SELECT SELECT
@ -136,7 +125,6 @@
, SS1.TEL AS TEL2 , SS1.TEL AS TEL2
, SS1.FAX AS FAX2 , SS1.FAX AS FAX2
, SS1.FIRST_AGENT_ID , SS1.FIRST_AGENT_ID
, (SELECT BC.BUSINESS_TEAM_CD FROM M_BUSINESS_CHARGER BC WHERE BC.BUSINESS_CHARGER_CD = T.BUSINESS_CHARGER_CD) AS BUSINESS_TEAM_CD
FROM FROM
( (
SELECT SELECT
@ -152,7 +140,6 @@
, PI.REMARKS , PI.REMARKS
, PI.CREATE_USER , PI.CREATE_USER
, O.SALE_STORE_ID , O.SALE_STORE_ID
, (SELECT SS.BUSINESS_CHARGER_CD FROM M_SALES_STORE SS WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID ) AS BUSINESS_CHARGER_CD
, O.OBJECT_NAME , O.OBJECT_NAME
, O.OBJECT_NAME_OMIT , O.OBJECT_NAME_OMIT
, (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID