Przeglądaj źródła

공급업체출고처 수정불가 항목 정의에 따라 수정

gagamel 5 lat temu
rodzic
commit
c76ca3c0e3

+ 50 - 22
src/main/java/com/style24/persistence/mybatis/shop/TssBusiness.xml

@@ -37,8 +37,8 @@
 		     , SC.BILL_EMAIL                                           /*계산서이메일*/
 		     , SC.ECONTRACT_YN                                         /*전자계약여부*/
 		     , SC.REMARKS                                              /*비고*/
-		     , SC.USE_YN                                               /*사용여부*/
 		     , SC.NOTE                                                 /*배송안내*/
+		     , SC.USE_YN                                               /*사용여부*/
 		FROM   TB_SUPPLY_COMPANY SC
 		     , TB_SUPPLY_VENDOR SV
 		WHERE  SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
@@ -55,28 +55,14 @@
 	<update id="updateSupplyCompany" parameterType="SupplyCompany">
 		/* TssBusiness.updateSupplyCompany */
 		UPDATE TB_SUPPLY_COMPANY
-		SET    SUPPLY_COMP_NM = #{supplyCompNm}
-		     , BIZ_KIND = #{bizKind}
-		     , BIZ_TYPE = #{bizType}
-		     , OWNER_NM = #{ownerNm}
-		     , BIZ_ZIPCODE = #{bizZipcode}
-		     , BIZ_BASE_ADDR = #{bizBaseAddr}
-		     , BIZ_DTL_ADDR = #{bizDtlAddr}
-		     , MAIN_TELNO = #{mainTelno}
-		     , MAIN_FAXNO = #{mainFaxno}
-		     , HOMEPAGE_URL = #{homepageUrl}
-		     , BANK_CD = #{bankCd}
-		     , ACCOUNT_NO = #{accountNo}
-		     , DEPOSITOR_NM = #{depositorNm}
+		SET    HOMEPAGE_URL = #{homepageUrl}
 		     , CS_CHARGE_NM = #{csChargeNm}
 		     , CS_CHARGE_TELNO = #{csChargeTelno}
 		     , SETTLE_CHARGE_NM = #{settleChargeNm}
 		     , SETTLE_CHARGE_TELNO = #{settleChargeTelno}
 		     , SETTLE_CHARGE_EMAIL = #{settleChargeEmail}
 		     , BILL_EMAIL = #{billEmail}
-		     , REMARKS = #{remarks}
 		     , NOTE = #{note}
-		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 		WHERE  SUPPLY_COMP_CD = #{supplyCompCd}
@@ -190,10 +176,53 @@
 	</select>
 
 	<!-- 출고처 저장 -->
-	<update id="updateDeliveryLoc" parameterType="DeliveryLoc">
-		/*  TssBusiness.updateDeliveryLoc */
-		UPDATE TB_DELIVERY_LOC
-		SET    DELV_LOC_NM = #{delvLocNm}
+	<insert id="saveDeliveryLoc" parameterType="DeliveryLoc">
+		/*  TssBusiness.saveDeliveryInfo */
+		INSERT INTO TB_DELIVERY_LOC (
+		       DELV_LOC_CD
+		     , DELV_LOC_NM
+		     , SUPPLY_COMP_CD
+		     , DELV_LOC_CLSF
+		     , DELV_LOC_ZIPCODE
+		     , DELV_LOC_BASE_ADDR
+		     , DELV_LOC_DTL_ADDR
+		     , RTN_LOC_ZIPCODE
+		     , RTN_LOC_BASE_ADDR
+		     , RTN_LOC_DTL_ADDR
+		     , RTN_LOC_NM
+		     , USE_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		)
+		VALUES (
+		       CASE WHEN #{delvLocCd} IS NULL THEN
+		                (SELECT CONCAT('DL',LPAD(SUBSTRING(IFNULL(MAX(DELV_LOC_CD),'DL000'),3) + 1,3,'0'))
+		                 FROM   TB_DELIVERY_LOC Z
+		                 WHERE  DELV_LOC_CD LIKE 'DL%'
+		                )
+		            ELSE
+		                #{delvLocCd}
+		       END
+		     , #{delvLocNm}
+		     , #{supplyCompCd}
+		     , 'G024_30'
+		     , #{delvLocZipcode}
+		     , #{delvLocBaseAddr}
+		     , #{delvLocDtlAddr}
+		     , #{rtnLocZipcode}
+		     , #{rtnLocBaseAddr}
+		     , #{rtnLocDtlAddr}
+		     , #{rtnLocNm}
+		     , 'Y'
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		       DELV_LOC_NM = #{delvLocNm}
 		     , DELV_LOC_ZIPCODE = #{delvLocZipcode}
 		     , DELV_LOC_BASE_ADDR = #{delvLocBaseAddr}
 		     , DELV_LOC_DTL_ADDR = #{delvLocDtlAddr}
@@ -203,8 +232,7 @@
 		     , RTN_LOC_NM = #{rtnLocNm}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
-		WHERE  DELV_LOC_CD = #{delvLocCd}
-	</update>
+	</insert>
 
 	<!-- 브랜드 목록 -->
 	<select id="getBrandList" parameterType="Brand" resultType="Brand">

+ 2 - 2
src/main/java/com/style24/scm/biz/dao/TssBusinessDao.java

@@ -78,12 +78,12 @@ public interface TssBusinessDao {
 	Collection<DeliveryLoc> getDeliveryLocList(DeliveryLoc delvLoc);
 
 	/**
-	 * 출고처관리 Update
+	 * 출고처관리 저장
 	 * @param delvLoc - 출고처 정보
 	 * @author gagamel
 	 * @since 2020. 10. 16
 	 */
-	void updateDeliveryLoc(DeliveryLoc delvLoc);
+	void saveDeliveryLoc(DeliveryLoc delvLoc);
 
 	/**
 	 * 브랜드 목록

+ 4 - 2
src/main/java/com/style24/scm/biz/service/TssBusinessService.java

@@ -103,9 +103,11 @@ public class TssBusinessService {
 	 * @since 2020. 10. 16
 	 */
 	@Transactional("shopTxnManager")
-	public void updateDeliveryLoc(DeliveryLoc delvLoc) {
+	public void saveDeliveryLoc(DeliveryLoc delvLoc) {
+		delvLoc.setSupplyCompCd(TssSession.getInfo().getSupplyCompCd());
+		delvLoc.setRegNo(TssSession.getInfo().getUserNo());
 		delvLoc.setUpdNo(TssSession.getInfo().getUserNo());
-		businessDao.updateDeliveryLoc(delvLoc);
+		businessDao.saveDeliveryLoc(delvLoc);
 	}
 
 	/**

+ 2 - 2
src/main/java/com/style24/scm/biz/web/TssBusinessController.java

@@ -145,8 +145,8 @@ public class TssBusinessController extends TssBaseController {
 	 */
 	@PostMapping("/supply/company/delvloc/save")
 	@ResponseBody
-	public GagaResponse updateDeliveryLoc(@RequestBody DeliveryLoc delvLoc) {
-		businessService.updateDeliveryLoc(delvLoc);
+	public GagaResponse saveDeliveryLoc(@RequestBody DeliveryLoc delvLoc) {
+		businessService.saveDeliveryLoc(delvLoc);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 

+ 10 - 3
src/main/webapp/WEB-INF/views/business/DeliveryLocForm.html

@@ -89,7 +89,7 @@
 					<tr>
 						<th>출고처코드</th>
 						<td colspan="3">
-							<input type="text" class="w100" name="delvLocCd" maxlength="20" placeholder="출고처코드" readonly="readonly"/>
+							<input type="text" class="w100" name="delvLocCd" maxlength="20" placeholder="자동생성" readonly="readonly"/>
 						</td>
 					</tr>
 					<tr>
@@ -126,6 +126,7 @@
 			<!-- 버튼 배치 영역 -->
 			<ul class="panelBar">
 				<li class="right">
+					<button type="button" class="btn btn-info btn-lg" id="btnNew">신규</button>
 					<button type="button" class="btn btn-success btn-lg" id="btnSave">저장</button>
 				</li>
 			</ul>
@@ -146,11 +147,11 @@
 		},
 		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "출고처우편번호", field: "delvLocZipcode", width: 150, cellClass: 'text-center', hide: true },
-		{ headerName: "출고처기본주소", field: "delvLocBaseAddr", width: 200 },
+		{ headerName: "출고처기본주소", field: "delvLocBaseAddr", width: 300 },
 		{ headerName: "출고처상세주소", field: "delvLocDtlAddr", width: 200 },
 		{ headerName: "반품처명", field: "rtnLocNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "반품처우편번호", field: "rtnLocZipcode", width: 150, cellClass: 'text-center' },
-		{ headerName: "반품처기본주소", field: "rtnLocBaseAddr", width: 200 },
+		{ headerName: "반품처기본주소", field: "rtnLocBaseAddr", width: 300 },
 		{ headerName: "반품처상세주소", field: "rtnLocDtlAddr", width: 200 },
 		{
 			headerName: "사용여부", field: "useYn", width: 100, cellClass: 'text-center',
@@ -182,6 +183,12 @@
 	$('#btnSearch').on('click', function() {
 		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
 	});
+	
+	// 신규버튼
+	$('#btnNew').on('click', function() {
+		$("#detailForm")[0].reset();
+		$('#detailForm input[name=delvLocNm]').focus();
+	});
 
 	// 저장
 	$("#btnSave").on("click", function() {