Browse Source

合同变更BUG修复

anderx 6 years ago
parent
commit
0cea7db22b

+ 16 - 12
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -586,24 +586,28 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
-  select a.id,a.order_no orderNo,a.process_state processState,a.status,a.`type`,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, a.remarks,
-a.voucher_url voucherUrl,a.total_amount totalAmount,a.settlement_amount settlementAmount,a.change_amount changeAmount,a.applicant,a.dep_name depName, 
-a.project_state projectState,a.zxs_cost zxsCost, a.zxs_remarks zxsRemarks,date_format(a.payment_time,'%Y-%m-%d')paymentTimes,
-a.payment_amount paymentAmount,date_format(a. invoice_time,'%Y-%m-%d') invoiceTimes,a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-a.cw_cost cwCost,a.refundable_amount refundableAmount,a.cw_remarks cwRemarks
-from new_order_change a  where 1=1
+select
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
+	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
+	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
+	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1
 	and a.order_no= #{orderNo}
 	order by a.create_time desc
 	limit 1
   </select>
   
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
-  select a.id,a.order_no orderNo,a.process_state processState,a.status,a.`type`,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, a.remarks,
-a.voucher_url voucherUrl,a.total_amount totalAmount,a.settlement_amount settlementAmount,a.change_amount changeAmount,a.applicant,a.dep_name depName, 
-a.project_state projectState,a.zxs_cost zxsCost, a.zxs_remarks zxsRemarks,date_format(a.payment_time,'%Y-%m-%d')paymentTimes,
-a.payment_amount paymentAmount,date_format(a. invoice_time,'%Y-%m-%d') invoiceTimes,a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-a.cw_cost cwCost,a.refundable_amount refundableAmount,a.cw_remarks cwRemarks
-from new_order_change a  where 1=1 and a.id= #{id}
+  select
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
+	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
+	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
+	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 and a.id= #{id}
   </select>
   <select id="checkOderNo" resultType="java.lang.Integer">
   select count(*) from new_order_change

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -106,7 +106,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		TOrderNew torder=checkDeleteSign(orderNo);
 		TOrderNew onew = new TOrderNew();
 		onew.setOrderNo(orderNo);
-		onew.setDeleteSign(0);//正常
+		//onew.setDeleteSign(0);//锁定订单也能走流程
 		onew.setApproval(approval);//特批状态
 		onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
 		onew.setOrderStatus(OrderNewState.QDSHTG.getCode());//营销管理员审核通过
@@ -132,7 +132,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
 

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -227,6 +227,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setStatus(1);//订单置为正常
 			noc.setProcessState(1);//流程置为营销管理员
 			noc.setDepName(t.getDepName());
+			OrderChangeLog ocl=new OrderChangeLog();
+			ocl.setAuditor(TokenManager.getAdminId());
+			ocl.setOrderNo(t.getOrderNo());
+			ocl.setRemarks("重新发起了订单变更");
+			ocl.setChangeId(noc.getId());
+			ocl.setStatus(0);
+			orderChangeLogMapper.insertSelective(ocl);
+			
 		}else if(changeType==1) {
 			noc.setProjectState(t.getProjectState());
 			noc.setZxsCost(t.getZxsCost());

+ 1 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -428,7 +428,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource, TOrderOutsource o) {
 		TOrderNew t= new TOrderNew();
 		TOrderNew t2= checkDeleteSign(orderNo);
-		if(t2.getDeleteSign()!=0)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
@@ -764,7 +763,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -104,7 +104,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
 	public void addOrderLog(String orderNo, Integer code) {