同步Q5代码

ws_objects/Ew_machining.pbl.src/w_rp_order_wfjg.srw

@@ -125,6 +125,12 @@ ELSEIF dw_1.dataobject = 'dw_rp_order_wfjgmx_out' THEN
 	f_hide_col(121,dw_1,s_col)
 END IF
 
+s_hide_col s_col2
+s_col2.col_1 = 'u_order_wfjgmx_price'
+s_col2.col_2 = 'amt'
+s_col2.col_3 = 'u_order_wfjgmx_out_price'
+f_hide_col(1448,dw_1,s_col2)
+
 end event
 
 type st_3 from w_publ_easyq`st_3 within w_rp_order_wfjg

ws_objects/Ew_report.pbl.src/w_rp_buy_buytask.srw

@@ -96,6 +96,9 @@ s_col.col_5 = 'u_buytaskmx_tax'
 s_col.col_6 = 'u_buytaskmx_uamt_tax'
 s_col.col_7 = 'u_buytaskmx_bsamt'
 s_col.col_8 = 'u_buytaskmx_bsamt_tax'
+s_col.col_9  = 'u_buytask_mstpayamt'
+s_col.col_10 = 'u_buytask_payamt'
+s_col.col_11 = 'nopayamt'
 f_hide_col(121,dw_1,s_col)
 
 s_hide_col s_col_mtrlsectype

ws_objects/Ew_report.pbl.src/w_rp_buy_mtrl.srw

@@ -39,6 +39,28 @@ long cur_scid_arr[]
 
 end variables
 
+forward prototypes
+public subroutine wf_hidecol ()
+end prototypes
+
+public subroutine wf_hidecol ();s_hide_col s_col
+s_col.col_1 = 'avgprice'
+s_col.col_2 = 'amt'
+s_col.col_3 = 'jamt'
+s_col.col_4 = 'uamt_notax'
+s_col.col_5 = 'juamt_notax'
+f_hide_col(121,dw_1,s_col)
+
+s_hide_col s_col_mtrlsectype
+s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
+f_hide_col(1308,dw_1,s_col_mtrlsectype) 
+
+s_hide_col s_col_zxmtrlmode
+s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
+f_hide_col(1309,dw_1,s_col_zxmtrlmode)
+
+end subroutine
+
 on w_rp_buy_mtrl.create
 int iCurrent
 call super::create
@@ -70,22 +92,6 @@ destroy(this.st_5)
 destroy(this.ddlb_3)
 end on
 
-event ue_before_openretrieve;call super::ue_before_openretrieve;s_hide_col s_col
-s_col.col_1 = 'avgprice'
-s_col.col_2 = 'amt'
-s_col.col_3 = 'jamt'
-f_hide_col(121,dw_1,s_col)
-
-s_hide_col s_col_mtrlsectype
-s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
-f_hide_col(1308,dw_1,s_col_mtrlsectype) 
-
-s_hide_col s_col_zxmtrlmode
-s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
-f_hide_col(1309,dw_1,s_col_zxmtrlmode)
-
-end event
-
 type cb_func from w_publ_easyq`cb_func within w_rp_buy_mtrl
 end type
 
@@ -116,6 +122,7 @@ IF dw_1.DataObject = 'dw_rp_buy_mtrl' THEN
 	f_hide_col(121,dw_1,s_col)
 END IF
 
+//wf_hidecol()
 end event
 
 type st_3 from w_publ_easyq`st_3 within w_rp_buy_mtrl

ws_objects/Ew_report.pbl.src/w_rp_buy_mx.srw

@@ -37,6 +37,35 @@ Long cur_secflag = -1
 long cur_scid_arr[]
 end variables
 
+forward prototypes
+public subroutine wf_hidecol ()
+end prototypes
+
+public subroutine wf_hidecol ();s_hide_col s_col
+
+s_col.col_1 = 'u_inwaremx_uprice'
+s_col.col_2 = 'u_inwaremx_fprice'
+s_col.col_3 = 'u_inwaremx_rebate'
+s_col.col_4 = 'u_inwaremx_price'
+s_col.col_5 = 'amt'
+s_col.col_6 = 'u_inware_otheramt'
+s_col.col_7 = 'uprice_notax'
+s_col.col_8 = 'uamt_notax'
+s_col.col_9 = 'u_inwaremx_uamt_tax'
+s_col.col_10 = 'fprice_notax'
+s_col.col_11 = 'payamt'
+s_col.col_12 = 'balcamt'
+f_hide_col(121,dw_1,s_col)
+
+s_hide_col s_col_mtrlsectype
+s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
+f_hide_col(1308,dw_1,s_col_mtrlsectype) 
+
+s_hide_col s_col_zxmtrlmode
+s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
+f_hide_col(1309,dw_1,s_col_zxmtrlmode)
+end subroutine
+
 on w_rp_buy_mx.create
 int iCurrent
 call super::create
@@ -68,26 +97,6 @@ destroy(this.ddlb_status)
 destroy(this.ddlb_1)
 end on
 
-event ue_before_openretrieve;call super::ue_before_openretrieve;s_hide_col s_col
-
-s_col.col_1 = 'u_inwaremx_uprice'
-s_col.col_2 = 'u_inwaremx_fprice'
-s_col.col_3 = 'u_inwaremx_rebate'
-s_col.col_4 = 'u_inwaremx_price'
-s_col.col_5 = 'amt'
-s_col.col_6 = 'u_inware_otheramt'
-
-f_hide_col(121,dw_1,s_col)
-
-s_hide_col s_col_mtrlsectype
-s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
-f_hide_col(1308,dw_1,s_col_mtrlsectype) 
-
-s_hide_col s_col_zxmtrlmode
-s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
-f_hide_col(1309,dw_1,s_col_zxmtrlmode)
-end event
-
 event open;call super::open;dw_1.SetTransObject (sqlca)
 end event
 
@@ -117,20 +126,21 @@ end_date = DateTime(Date(em_2.Text),Time('23:59:59'))
 
 dw_1.Retrieve(cur_scid_arr,first_date,end_date,cur_flag,cur_storageid_arr,cur_secflag,sys_user_spttype  )
 
-s_hide_col s_col
-
-IF dw_1.DataObject = 'dw_rp_buy_mx' THEN
-	s_col.col_1 = 'uprice_notax'
-	s_col.col_2 = 'fprice_notax'
-	s_col.col_3 = 'uamt_notax'
-     f_hide_col(121,dw_1,s_col)
-ELSEIF dw_1.DataObject = 'dw_rp_buy_mx_noxj' THEN
-	s_col.col_1 = 'uprice_notax'
-	s_col.col_2 = 'fprice_notax'
-	s_col.col_3 = 'uamt_notax'
-     f_hide_col(121,dw_1,s_col)
-END IF
-
+//s_hide_col s_col
+
+//IF dw_1.DataObject = 'dw_rp_buy_mx' THEN
+//	s_col.col_1 = 'uprice_notax'
+//	s_col.col_2 = 'fprice_notax'
+//	s_col.col_3 = 'uamt_notax'
+//     f_hide_col(121,dw_1,s_col)
+//ELSEIF dw_1.DataObject = 'dw_rp_buy_mx_noxj' THEN
+//	s_col.col_1 = 'uprice_notax'
+//	s_col.col_2 = 'fprice_notax'
+//	s_col.col_3 = 'uamt_notax'
+//     f_hide_col(121,dw_1,s_col)
+//END IF
+//
+//wf_hidecol()
 
 end event
 

ws_objects/Ew_report.pbl.src/w_rp_buy_spt_mtrl.srw

@@ -32,6 +32,24 @@ Long cur_secflag = -1
 
 end variables
 
+forward prototypes
+public subroutine wf_hidecol ()
+end prototypes
+
+public subroutine wf_hidecol ();s_hide_col s_col
+s_col.col_1 = 'amt'	
+s_col.col_2 = 'uamt_notax'
+f_hide_col(121,dw_1,s_col)
+
+s_hide_col s_col_mtrlsectype
+s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
+f_hide_col(1308,dw_1,s_col_mtrlsectype) 
+
+s_hide_col s_col_zxmtrlmode
+s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
+f_hide_col(1309,dw_1,s_col_zxmtrlmode)
+end subroutine
+
 on w_rp_buy_spt_mtrl.create
 int iCurrent
 call super::create
@@ -57,19 +75,6 @@ destroy(this.st_2)
 destroy(this.ddlb_3)
 end on
 
-event ue_before_openretrieve;call super::ue_before_openretrieve;s_hide_col s_col
-s_col.col_1 = 'amt'	
-f_hide_col(121,dw_1,s_col)
-
-s_hide_col s_col_mtrlsectype
-s_col_mtrlsectype.col_1 = 'u_mtrldef_mtrlsectype' 
-f_hide_col(1308,dw_1,s_col_mtrlsectype) 
-
-s_hide_col s_col_zxmtrlmode
-s_col_zxmtrlmode.col_1 = 'u_mtrldef_zxmtrlmode' 
-f_hide_col(1309,dw_1,s_col_zxmtrlmode)
-end event
-
 type cb_func from w_publ_easyq`cb_func within w_rp_buy_spt_mtrl
 end type
 
@@ -93,11 +98,12 @@ event cb_1::clicked;call super::clicked;DateTime first_date,end_date
 first_date = DateTime(Date(em_1.Text),Time(0))
 end_date = DateTime(Date(em_2.Text),Time('23:59:59'))
 dw_1.Retrieve(first_date,end_date,cur_flag,cur_storageid_arr,cur_secflag,sys_user_spttype  )
-IF dw_1.DataObject = 'dw_rp_buy_spt_mtrl' THEN
-	s_hide_col s_col
-	s_col.col_1 = 'uamt_notax'
-	f_hide_col(121,dw_1,s_col)
-END IF
+//IF dw_1.DataObject = 'dw_rp_buy_spt_mtrl' THEN
+//	s_hide_col s_col
+//	s_col.col_1 = 'uamt_notax'
+//	f_hide_col(121,dw_1,s_col)
+//END IF
+//wf_hidecol()
 
 end event
 

ws_objects/Ew_report.pbl.src/w_rp_sale_cusarea.srw

@@ -64,7 +64,7 @@ end subroutine
 
 public subroutine wf_hidecol ();
 
-s_hide_col s_col1,s_col2
+s_hide_col s_col1,s_col2,s_col3
 
 s_col1.col_1 = 'costamt'
 f_hide_col(490,dw_1,s_col1)
@@ -79,6 +79,13 @@ s_col_plan.col_2 = 'enamt_plan'
 s_col_plan.col_3 = 'gpamt_plan'
 f_hide_col(1451,dw_1,s_col_plan)
 
+s_col3.col_1 = 'amt'
+s_col3.col_2 = 'otheramt'
+s_col3.col_3 = 'gpamt'
+s_col3.col_4 = 'enamt_notax'
+s_col3.col_5 = 'gpamt_notax'
+f_hide_col(122,dw_1,s_col3)
+
 end subroutine
 
 on w_rp_sale_cusarea.create

ws_objects/Ew_report.pbl.src/w_rp_sale_cust_mtrl.srw

@@ -57,6 +57,17 @@ f_hide_col(1309,dw_1,s_col_zxmtrlmode)
 s_hide_col s_col3
 s_col3.col_1 = 'u_outwaremx_cost'
 f_hide_col(123,dw_1,s_col3)
+
+s_hide_col s_col4
+s_col4.col_1 = 'amt'
+s_col4.col_2 = 'gpamt'
+s_col4.col_3 = 'enamt2'
+s_col4.col_4 = 'enamt_notax'
+s_col4.col_5 = 'enprice_notax'
+s_col4.col_6 = 'gpamt_notax'
+s_col4.col_7 = 'jenamt_notax'
+s_col4.col_8 = 'aprice'
+f_hide_col(122,dw_1,s_col4)
 end subroutine
 
 on w_rp_sale_cust_mtrl.create

ws_objects/Ew_report.pbl.src/w_rp_sale_mtrl.srw

@@ -92,6 +92,17 @@ s_col_plan.col_2 = 'enamt_plan'
 s_col_plan.col_3 = 'gpamt_plan'
 f_hide_col(1451,dw_1,s_col_plan)
 
+s_hide_col s_col_2
+s_col_2.col_1 = 'amt'
+s_col_2.col_2 = 'enamt2'
+s_col_2.col_3 = 'enamt_notax'
+s_col_2.col_4 = 'enprice_notax'
+s_col_2.col_5 = 'jamt'
+s_col_2.col_6 = 'gpamt_notax'
+s_col_2.col_7 = 'grossprofit'
+s_col_2.col_8 = 'v_temp_storage_v_amt'
+f_hide_col(122,dw_1,s_col_2)
+
 end subroutine
 
 on w_rp_sale_mtrl.create

ws_objects/Ew_report.pbl.src/w_rp_sale_mx.srw

@@ -150,10 +150,22 @@ f_hide_col(122,dw_1,s_col3)
 s_col3 = s_null
 s_col3.col_1 = 'famt_norebate'
 s_col3.col_2 = 'famt_rebate'
+s_col3.col_3 ='enamt2'
+s_col3.col_4 ='billamt'
+s_col3.col_5 ='takeamt'
+s_col3.col_6 ='balcamt'
+s_col3.col_7 ='enamt_notax'
+s_col3.col_8 ='enprice_notax'
+s_col3.col_9 ='u_outwaremx_bsamt'
+s_col3.col_10 ='priceamt'
+s_col3.col_11 ='bill_amt'
 f_hide_col(122,dw_1,s_col3)
 
 s_col3 = s_null
 s_col3.col_1 = 'newprice'
+s_col3.col_2 = 'gpamt'
+s_col3.col_3 = 'gpamt_notax'
+s_col3.col_4 = 'enprice_notax_1'
 f_hide_col(122,dw_1,s_col3)
 
 s_hide_col s_col_mtrlsectype

ws_objects/Ew_report.pbl.src/w_rp_sale_saletask.srw

@@ -152,6 +152,9 @@ IF dw_1.DataObject = 'dw_rp_sale_saletask' THEN
 	s_col.col_6 = 'nottakeamt'
 	s_col.col_7 = 'newprice'
 	s_col.col_8 = 'enamt2'
+	s_col.col_9 = 'b_enamt'
+	s_col.col_10 = 'mamt'
+	s_col.col_11 = 'realbookamt'
 	f_hide_col(122,dw_1,s_col)
 	
 	
@@ -217,7 +220,15 @@ ELSEIF dw_1.DataObject = 'dw_rp_sale_saletask_mx' THEN
 	
 	s_col = s_null
 	s_col.col_1 = 'consignedenamt'
-    s_col.col_2 = 'unconsignedenamt'	
+    s_col.col_2 = 'unconsignedenamt'
+	 s_col.col_3 = 'u_saletask_msttakeamt'
+	s_col.col_4 =  'u_saletask_takeamt'
+	s_col.col_5 =  'nottakeamt'
+	s_col.col_6 =  'u_saletask_takedamt'
+	 s_col.col_7 = 'newprice'
+	s_col.col_8 = 'enamt2'
+	s_col.col_9 = 'b_enamt'
+	s_col.col_10 = 'mamt'
 	f_hide_col(122,dw_1,s_col)
 	
 ELSEIF dw_1.DataObject = 'dw_rp_sale_saletask_hz_amt' THEN
@@ -235,7 +246,10 @@ ELSEIF dw_1.DataObject = 'dw_rp_sale_saletask_hz_amt' THEN
 	s_col.col_12 = 'realbookamt'
 	f_hide_col(122,dw_1,s_col)
 	
-	
+	s_col = s_null
+	s_col.col_1 = 'b_enamt'
+	s_col.col_2 = 'mamt'
+	f_hide_col(122,dw_1,s_col)
 END IF
 
 

ws_objects/Ew_sale.pbl.src/dw_outware_sale_edit.srd

@@ -64,6 +64,7 @@ table(column=(type=long updatewhereclause=yes name=u_outware_outwareid dbname="o
  column=(type=char(30) updatewhereclause=yes name=u_cust_bank dbname="bank" )
  column=(type=char(30) updatewhereclause=yes name=u_cust_cunt dbname="cunt" )
  column=(type=decimal(15) updatewhereclause=yes identity=yes name=billamt dbname="billamt" )
+ column=(type=decimal(5) updatewhereclause=yes identity=yes name=billamtallother dbname="billamtAllother" )
  column=(type=decimal(2) updatewhereclause=yes name=takeamt dbname="takeamt" )
  column=(type=decimal(2) updatewhereclause=yes identity=yes name=balcamt dbname="balcamt" )
  column=(type=datetime updatewhereclause=yes name=u_bmsttake_finishdate dbname="finishdate" )
@@ -135,6 +136,7 @@ u_outware.viewdate,
 	u_cust.bank,
 	u_cust.cunt,
 	isnull(uv_rp_outware_sale.amt,0) as billamt,
+	0.00000 AS billamtAllother,
 
 	takeamt,
 	(Msttakeamt - takeamt) as balcamt,

ws_objects/Ew_sale.pbl.src/dw_saletask_input.srd

@@ -68,6 +68,7 @@ table(column=(type=long updatewhereclause=yes name=taskid dbname="u_SaleTask.Tas
  column=(type=long updatewhereclause=yes identity=yes name=delay_days dbname="delay_days" )
  column=(type=decimal(5) updatewhereclause=yes identity=yes name=u_saletaskmx_enamt_tax dbname="u_SaleTaskMx.enamt_tax" dbalias=".enamt_tax" )
  column=(type=long updatewhereclause=yes identity=yes name=ifsj dbname="u_SaleTask.ifsj" dbalias=".ifsj" )
+ column=(type=decimal(5) updatewhereclause=yes identity=yes name=billamtallother dbname="billamtAllother" )
  retrieve="SELECT TOP 0 u_SaleTask.TaskID
 	,u_SaleTask.moneyid
 	,u_SaleTask.mrate
@@ -149,7 +150,8 @@ table(column=(type=long updatewhereclause=yes name=taskid dbname="u_SaleTask.Tas
 		WHEN u_SaleTaskmx.enamt_tax > 0
 			THEN 1
 		ELSE 0
-		END AS ifsj
+		END AS ifsj,
+	0.00000 as billamtAllother
 FROM u_SaleTask
 LEFT OUTER JOIN u_cust ON u_SaleTask.CusID = u_cust.cusid
 LEFT OUTER JOIN u_cusarea ON u_cust.cusareaid = u_cusarea.cusareaid

ws_objects/Ew_sale.pbl.src/w_outware_sale.srw

@@ -3838,6 +3838,7 @@ LEFT OUTER JOIN (
 	SELECT u_outwaremx.scid
 		,u_outwaremx.outwareid
 		,sum(enamt_tax) AS enamt_tax
+		,sum(otherprice) AS otherprice
 	FROM u_outwaremx
 	GROUP BY u_outwaremx.scid
 		,u_outwaremx.outwareid
@@ -4129,7 +4130,8 @@ Long i
 		u_saletaskmx.tax,
 		u_saletaskmx.mxdscrp3,
 		u_saletaskmx.mxdscrp4,
-		u_saletaskmx.priceformula
+		u_saletaskmx.priceformula,
+		u_saletaskmx.otherprice
 		FROM u_saletaskmx  LEFT OUTER JOIN
       uv_outware_sale_noaudit_qty ON 
       u_SaleTaskMx.scid = uv_outware_sale_noaudit_qty.scid AND 
@@ -4164,7 +4166,8 @@ Long i
 		:arg_s_rqmtrl.tax[arg_p_rqmtrl],
 		:arg_s_rqmtrl.mxdscrp3[arg_p_rqmtrl],
 		:arg_s_rqmtrl.mxdscrp4[arg_p_rqmtrl],
-		:arg_s_rqmtrl.priceformula[arg_p_rqmtrl]
+		:arg_s_rqmtrl.priceformula[arg_p_rqmtrl],
+		:arg_s_rqmtrl.otherprice[arg_p_rqmtrl]
 		;
 	DO WHILE sqlca.SQLCode = 0
 		arg_p_rqmtrl++
@@ -4188,7 +4191,8 @@ Long i
 		:arg_s_rqmtrl.tax[arg_p_rqmtrl],
 		:arg_s_rqmtrl.mxdscrp3[arg_p_rqmtrl],
 		:arg_s_rqmtrl.mxdscrp4[arg_p_rqmtrl],
-		:arg_s_rqmtrl.priceformula[arg_p_rqmtrl]
+		:arg_s_rqmtrl.priceformula[arg_p_rqmtrl],
+		:arg_s_rqmtrl.otherprice[arg_p_rqmtrl]
 		;
 	LOOP
 	arg_p_rqmtrl = arg_p_rqmtrl - 1
@@ -4578,7 +4582,8 @@ FOR i = 1 To UpperBound(arg_s_rqmtrl.taskid)
 		u_saletaskmx.tax,
 		u_saletaskmx.mxdscrp3,
 		u_saletaskmx.mxdscrp4,
-		u_saletaskmx.priceformula
+		u_saletaskmx.priceformula,
+		u_saletaskmx.otherprice
 		INTO :arg_s_rqmtrl.mtrlid[i],
 		:arg_s_rqmtrl.qty[i],
 		:arg_s_rqmtrl.enprice[i],
@@ -4604,7 +4609,8 @@ FOR i = 1 To UpperBound(arg_s_rqmtrl.taskid)
 		:arg_s_rqmtrl.tax[i],
 		:arg_s_rqmtrl.mxdscrp3[i],
 		:arg_s_rqmtrl.mxdscrp4[i],
-		:arg_s_rqmtrl.priceformula[i]
+		:arg_s_rqmtrl.priceformula[i],
+		:arg_s_rqmtrl.otherprice[i]
 		FROM u_SaleTaskMx INNER JOIN
 		u_SaleTask ON u_SaleTaskMx.TaskID = u_SaleTask.TaskID AND
 		u_SaleTaskMx.scid = u_SaleTask.scid  LEFT OUTER JOIN
@@ -6538,6 +6544,8 @@ For i = 1 To UpperBound(arg_mx.taskid)
 		dw_child.Object.u_cusmtrlname_cusmtrlname[child_row] = ls_cusmtrlname    
 		dw_child.Object.u_cusmtrlname_cusmtrlcode[child_row] = ls_cusmtrlname
 		dw_child.Object.u_cusmtrlname_cusmtrlmode[child_row] =ls_cusmtrlname
+		dw_child.Object.u_outwaremx_otherprice[child_row] = arg_mx.otherprice[i]
+		
 		
 		//dw_
 		
@@ -6696,6 +6704,7 @@ For i = 1 To UpperBound(arg_mx.taskid)
 			dw_child.Object.u_cusmtrlname_cusmtrlname[child_row] = ls_cusmtrlname    
 			dw_child.Object.u_cusmtrlname_cusmtrlcode[child_row] = ls_cusmtrlname
 			dw_child.Object.u_cusmtrlname_cusmtrlmode[child_row] =ls_cusmtrlname
+			dw_child.Object.u_outwaremx_otherprice[child_row] = arg_mx.otherprice[i]
 			
 			//计算单价
 			If arg_mx.priceformula[i] <> '' and dw_child.Object.u_outwaremx_ifrel[child_row] = 0 Then
@@ -11491,6 +11500,7 @@ IF dw_edit_mode THEN
 			s_mx.status = dw_child.Object.u_outwaremx_status[i] 
 			s_mx.woodcode = dw_child.Object.u_outwaremx_woodcode[i] 
 			s_mx.pcode = dw_child.Object.u_outwaremx_pcode[i] 
+			s_mx.otherprice = dw_child.Object.u_outwaremx_otherprice[i] 
 			
 			IF uo_ware.acceptmx(s_mx, arg_msg) = 0 THEN
 				MessageBox('错误',arg_msg,stopsign!,OK!)