발주서 양식 변경 (외주가공)
This commit is contained in:
@@ -980,6 +980,11 @@ public class PurchaseOrderController {
|
||||
request.setAttribute("objId", objId);
|
||||
request.setAttribute("writer", writer);
|
||||
request.setAttribute("writerName", writerName);
|
||||
|
||||
// 담당자 목록 (사원 목록)
|
||||
Map userParam = new HashMap();
|
||||
List userList = commonService.selectList("common.getUserList", request, userParam);
|
||||
request.setAttribute("userList", userList);
|
||||
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -550,7 +550,8 @@
|
||||
STATUS,
|
||||
SALES_REQUEST_OBJID,
|
||||
SALES_MNG_USER_ID,
|
||||
SALES_MNG_USER_ID2
|
||||
SALES_MNG_USER_ID2,
|
||||
FORM_TYPE
|
||||
,TITLE
|
||||
,PURCHASE_DATE
|
||||
,CONTRACT_MGMT_OBJID
|
||||
@@ -606,7 +607,8 @@
|
||||
#{STATUS},
|
||||
#{SALES_REQUEST_OBJID},
|
||||
#{SALES_MNG_USER_ID},
|
||||
#{SALES_MNG_USER_ID2}
|
||||
#{SALES_MNG_USER_ID2},
|
||||
#{FORM_TYPE}
|
||||
,#{TITLE}
|
||||
,#{PURCHASE_DATE}
|
||||
,#{CONTRACT_MGMT_OBJID}::NUMERIC
|
||||
@@ -661,6 +663,9 @@
|
||||
STATUS = #{STATUS},
|
||||
SALES_MNG_USER_ID = #{SALES_MNG_USER_ID},
|
||||
SALES_MNG_USER_ID2 = #{SALES_MNG_USER_ID2}
|
||||
<if test="FORM_TYPE != null and FORM_TYPE != ''">
|
||||
,FORM_TYPE = #{FORM_TYPE}
|
||||
</if>
|
||||
,TITLE = #{TITLE}
|
||||
,PURCHASE_DATE = #{PURCHASE_DATE}
|
||||
,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}::NUMERIC
|
||||
@@ -745,7 +750,8 @@
|
||||
REGDATE,
|
||||
STATUS,
|
||||
SALES_REQUEST_OBJID,
|
||||
SALES_MNG_USER_ID
|
||||
SALES_MNG_USER_ID,
|
||||
FORM_TYPE
|
||||
,TITLE
|
||||
,PURCHASE_DATE
|
||||
,CONTRACT_MGMT_OBJID
|
||||
@@ -784,7 +790,8 @@
|
||||
NOW(),
|
||||
'create',
|
||||
#{SALES_REQUEST_OBJID},
|
||||
#{SALES_MNG_USER_ID}
|
||||
#{SALES_MNG_USER_ID},
|
||||
#{FORM_TYPE}
|
||||
,#{TITLE}
|
||||
,#{PURCHASE_DATE}
|
||||
,NULLIF(#{PROJECT_NO}::TEXT, '')::NUMERIC
|
||||
@@ -1167,6 +1174,9 @@
|
||||
,REAL_ORDER_QTY
|
||||
,REAL_SUPPLY_PRICE
|
||||
,PART_DELIVERY_PLACE
|
||||
,PRODUCT_NAME
|
||||
,WORK_ORDER_NO
|
||||
,DELIVERY_REQUEST_DATE
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@@ -1207,6 +1217,9 @@
|
||||
,REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '')
|
||||
,REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '')
|
||||
,#{PART_DELIVERY_PLACE}
|
||||
,#{PRODUCT_NAME}
|
||||
,#{WORK_ORDER_NO}
|
||||
,#{DELIVERY_REQUEST_DATE}
|
||||
) ON CONFLICT (OBJID) DO
|
||||
UPDATE
|
||||
SET
|
||||
@@ -1235,6 +1248,9 @@
|
||||
,REAL_ORDER_QTY = REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '')
|
||||
,REAL_SUPPLY_PRICE = REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '')
|
||||
,PART_DELIVERY_PLACE = #{PART_DELIVERY_PLACE}
|
||||
,PRODUCT_NAME = #{PRODUCT_NAME}
|
||||
,WORK_ORDER_NO = #{WORK_ORDER_NO}
|
||||
,DELIVERY_REQUEST_DATE = #{DELIVERY_REQUEST_DATE}
|
||||
</update>
|
||||
|
||||
<select id="getMyCompanyInfo" parameterType="map" resultType="map">
|
||||
@@ -2253,6 +2269,8 @@
|
||||
,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = T.UNIT) AS UNIT_NAME
|
||||
,P.PART_NO P_PART_NO
|
||||
,POM.BOM_REPORT_OBJID
|
||||
,POM.PURCHASE_ORDER_NO
|
||||
,(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::varchar = POM.PARTNER_OBJID) AS PARTNER_NAME
|
||||
FROM PURCHASE_ORDER_PART T
|
||||
INNER JOIN PURCHASE_ORDER_MASTER POM
|
||||
ON POM.OBJID = T.PURCHASE_ORDER_MASTER_OBJID
|
||||
|
||||
Reference in New Issue
Block a user