Compare commits

..

No commits in common. "13a6e7fae91f647247b201bed400c668ed44d418" and "db22df518ec8c2136273e94eb842482b432b7d52" have entirely different histories.

4 changed files with 44 additions and 73 deletions

View File

@ -1082,49 +1082,39 @@ export default function StuffDetail() {
return return
} }
// [PLANREQ-FORCE-SELECT 2026-06-05] T01 / 1 user + 2 ID // T01 / 1 user + 2 ID: firstAgent ( )
// + 2 + selected get({ url: `/api/object/saleStore/${info.saleStoreId}/firstAgent` }).then((res) => {
// 1 (firstAgent) 1 logger.debug('[PLANREQ-DEBUG] firstAgent result', { firstAgentId: res?.firstAgentId })
// 'No data' (4xx + message) , if (!res?.firstAgentId) {
const applyOtherSaleStore = () => { swalFire({
title: getMessage('stuff.detail.planReq.message.notMatch'),
type: 'alert',
icon: 'warning',
})
return
}
applyFields() applyFields()
setOtherSaleStoreList((prev) => {
const exists = prev.some((o) => o.saleStoreId === info.saleStoreId)
return exists ? prev : [...prev, { saleStoreId: info.saleStoreId, saleStoreName: info.saleStoreName }]
})
setOtherSelOptions(info.saleStoreId) setOtherSelOptions(info.saleStoreId)
form.setValue('otherSaleStoreId', info.saleStoreId) form.setValue('otherSaleStoreId', info.saleStoreId)
form.setValue('otherSaleStoreName', info.saleStoreName) form.setValue('otherSaleStoreName', info.saleStoreName)
form.setValue('otherSaleStoreLevel', info.saleStoreLevel) form.setValue('otherSaleStoreLevel', info.saleStoreLevel)
} const firstAgent = { saleStoreId: res.firstAgentId, saleStoreName: res.firstAgentName }
get({ url: `/api/object/saleStore/${info.saleStoreId}/firstAgent` }).then((res) => { setSaleStoreList((prev) => {
logger.debug('[PLANREQ-DEBUG] firstAgent result', { firstAgentId: res?.firstAgentId }) const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
applyOtherSaleStore() return exists ? prev : [...prev, firstAgent]
if (res?.firstAgentId) { })
const firstAgent = { saleStoreId: res.firstAgentId, saleStoreName: res.firstAgentName } setShowSaleStoreList((prev) => {
setSaleStoreList((prev) => { const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
const exists = prev.some((s) => s.saleStoreId === res.firstAgentId) return exists ? prev : [...prev, firstAgent]
return exists ? prev : [...prev, firstAgent] })
}) setSelOptions(res.firstAgentId)
setShowSaleStoreList((prev) => { form.setValue('saleStoreId', res.firstAgentId)
const exists = prev.some((s) => s.saleStoreId === res.firstAgentId) form.setValue('saleStoreName', res.firstAgentName)
return exists ? prev : [...prev, firstAgent] form.setValue('saleStoreLevel', '1')
}) }).catch(() => {
setSelOptions(res.firstAgentId) // +
form.setValue('saleStoreId', res.firstAgentId)
form.setValue('saleStoreName', res.firstAgentName)
form.setValue('saleStoreLevel', '1')
}
}).catch((error) => {
// 'No data' 1 2 +select
const message = error?.response?.data?.message
if (message === 'No data') {
applyOtherSaleStore()
return
}
// /
swalFire({ swalFire({
title: getMessage('stuff.detail.planReq.message.networkError'), title: getMessage('stuff.detail.planReq.message.notMatch'),
type: 'alert', type: 'alert',
icon: 'warning', icon: 'warning',
}) })
@ -1888,18 +1878,16 @@ export default function StuffDetail() {
)) || )) ||
null} null}
</div> </div>
{session?.storeId === 'T01' && ( <button
<button type="button"
type="button" className="btn-origin grey"
className="btn-origin grey" onClick={() => {
onClick={() => { onSearchDesignRequestPopOpen()
onSearchDesignRequestPopOpen() }}
}} style={{ display: showButton }}
style={{ display: showButton }} >
> {getMessage('stuff.planReqPopup.title')}
{getMessage('stuff.planReqPopup.title')} </button>
</button>
)}
</div> </div>
</td> </td>
</tr> </tr>
@ -2480,7 +2468,7 @@ export default function StuffDetail() {
></button> ></button>
) : null} ) : null}
</div> </div>
{managementState?.tempFlg === '1' && session?.storeId === 'T01' ? ( {managementState?.tempFlg === '1' ? (
<> <>
<button <button
type="button" type="button"

View File

@ -810,7 +810,6 @@
"stuff.detail.tempSave.message3": "二次販売店を選択してください。", "stuff.detail.tempSave.message3": "二次販売店を選択してください。",
"stuff.detail.confirm.message1": "販売店情報を変更すると、設計依頼文書番号が削除されます。変更しますか?", "stuff.detail.confirm.message1": "販売店情報を変更すると、設計依頼文書番号が削除されます。変更しますか?",
"stuff.detail.planReq.message.notMatch": "設計依頼の販売店情報が一致しないため、インポートできません。", "stuff.detail.planReq.message.notMatch": "設計依頼の販売店情報が一致しないため、インポートできません。",
"stuff.detail.planReq.message.networkError": "設計依頼情報の照会中にネットワークエラーが発生しました。しばらくしてから再度お試しください。",
"stuff.detail.delete.message1": "仕様が確定したものは削除できません。", "stuff.detail.delete.message1": "仕様が確定したものは削除できません。",
"stuff.detail.planList.title": "プランリスト", "stuff.detail.planList.title": "プランリスト",
"stuff.detail.planList.cnt": "全体", "stuff.detail.planList.cnt": "全体",

View File

@ -810,7 +810,6 @@
"stuff.detail.tempSave.message3": "2차 판매점을 선택해주세요.", "stuff.detail.tempSave.message3": "2차 판매점을 선택해주세요.",
"stuff.detail.confirm.message1": "판매점 정보를 변경하면 설계의뢰 문서번호가 삭제됩니다. 변경하시겠습니까?", "stuff.detail.confirm.message1": "판매점 정보를 변경하면 설계의뢰 문서번호가 삭제됩니다. 변경하시겠습니까?",
"stuff.detail.planReq.message.notMatch": "설계의뢰의 판매점 정보가 일치하지 않아 가져올 수 없습니다.", "stuff.detail.planReq.message.notMatch": "설계의뢰의 판매점 정보가 일치하지 않아 가져올 수 없습니다.",
"stuff.detail.planReq.message.networkError": "설계의뢰 정보 조회 중 네트워크 오류가 발생했습니다. 잠시 후 다시 시도해주세요.",
"stuff.detail.delete.message1": "사양이 확정된 물건은 삭제할 수 없습니다.", "stuff.detail.delete.message1": "사양이 확정된 물건은 삭제할 수 없습니다.",
"stuff.detail.planList.title": "플랜목록", "stuff.detail.planList.title": "플랜목록",
"stuff.detail.planList.cnt": "전체", "stuff.detail.planList.cnt": "전체",

View File

@ -210,28 +210,13 @@ export const applyKerabOffsetSurgical = (canvas, target, newOffset) => {
for (const other of cascadeTargets) { for (const other of cascadeTargets) {
if (!other || other === il) continue if (!other || other === il) continue
let moved = false let moved = false
const hit1 = pointOnOldSeg(other.x1, other.y1) if (pointOnOldSeg(other.x1, other.y1)) {
const hit2 = pointOnOldSeg(other.x2, other.y2) other.set({ x1: other.x1 + dxVExt, y1: other.y1 + dyVExt })
// [KERAB-VALLEY-EXT-PARALLEL 2026-06-05] vExt(골짜기 확장라인)는 self-extension moved = true
// 수직/수평 라인이라 한 끝만 cascade 로 끌면 대각선이 된다 (사용자 룰: 대각선은 hip뿐). }
// split 된 vExt 세그먼트는 한 끝만 옛 segment 에 닿아도 양 끝을 같은 변위로 평행이동. if (pointOnOldSeg(other.x2, other.y2)) {
if (other.lineName === 'kerabPatternValleyExt' && (hit1 || hit2)) { other.set({ x2: other.x2 + dxVExt, y2: other.y2 + dyVExt })
other.set({
x1: other.x1 + dxVExt,
y1: other.y1 + dyVExt,
x2: other.x2 + dxVExt,
y2: other.y2 + dyVExt,
})
moved = true moved = true
} else {
if (hit1) {
other.set({ x1: other.x1 + dxVExt, y1: other.y1 + dyVExt })
moved = true
}
if (hit2) {
other.set({ x2: other.x2 + dxVExt, y2: other.y2 + dyVExt })
moved = true
}
} }
if (moved) { if (moved) {
if (typeof other.setCoords === 'function') other.setCoords() if (typeof other.setCoords === 'function') other.setCoords()