Browse Source

变更列表BUG修复,变更后拆分限制

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
11e9905a54

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

@@ -819,7 +819,7 @@ select
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	<if test="complete ==0 and processState != 8">
-	 and a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState} 
+	 and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState}) 
 	</if>
 	<if test="complete ==0 and processState == 8">
 	 and (a.process_state &gt;= #{processState} and  a.process_state &lt; 9)or a.back_status &gt;= #{processState}

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

@@ -659,10 +659,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public int pushSplitProject(Integer tid, String splitList) {
 			String[] str=splitList.split(",");
 			TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(tid);
+			checkDeleteSign(task.getOrderNo());
 			TOrderTask usedTask=new TOrderTask();
 			usedTask.setId(tid);
 			usedTask.setSplitStatus(1);
-			tOrderTaskMapper.updateByPrimaryKeySelective(usedTask);
 			//计算拆分数量
 			Integer x=0;
 			for (String string : str) {
@@ -671,6 +671,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (!task.getCommodityQuantity().equals(x)||str.length==1) {
 				return -1;
 			}
+			tOrderTaskMapper.updateByPrimaryKeySelective(usedTask);
 			int i=1;
 			TOrderTask newTask=task;
 			newTask.setCommodityPrice(new BigDecimal(0));