【镝泰MES】返工工单下放时未被拆解的料会归属至新工单

src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

@@ -1,32 +1,26 @@
 package com.uas.mes.pm.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.uas.mes.common.dao.MakeDao;
 import com.uas.mes.common.data.BaseDao;
+import com.uas.mes.common.data.SqlUtil;
 import com.uas.mes.common.entity.MessageLog;
 import com.uas.mes.common.support.HandlerService;
 import com.uas.mes.common.support.SystemSession;
+import com.uas.mes.common.util.BaseUtil;
 import com.uas.mes.core.bind.Constant;
 import com.uas.mes.core.bind.Status;
 import com.uas.mes.core.data.Assert;
 import com.uas.mes.core.data.SqlRowList;
 import com.uas.mes.core.support.StateAssert;
-import com.uas.mes.common.util.BaseUtil;
 import com.uas.mes.core.util.DateUtil;
 import com.uas.mes.core.util.StringUtil;
-import com.uas.mes.common.data.SqlUtil;
 import com.uas.mes.pm.service.MakeBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 @Service("makeBaseService")
 public class MakeBaseServiceImpl implements MakeBaseService {
@@ -1597,6 +1591,10 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 						+" cm_dropdate=sysdate where  exists (select 1  from rework inner join reworkdetail on "
 						+" rd_reid=re_id  inner join makeserial on ms_sncode=rd_sncode and ms_makecode=rd_scmacode inner join makesndecompose on msd_recode=re_code where re_id=? "
 						+" and msd_fsoncode=cm_fsoncode and msd_stepcode=cm_stepcode and cm_firstsn=ms_firstsn)  and  nvl(cm_status,0)=0 ",re_code,SystemSession.getUser().getEm_code(),re_id);
+				baseDao.execute(" update craftmaterial set cm_makecode = ?,cm_maid = ? "
+						+"  where  exists (select 1  from rework inner join reworkdetail on "
+						+" rd_reid=re_id  inner join makeserial on ms_sncode=rd_sncode and ms_makecode=rd_scmacode inner join makesndecompose on msd_recode=re_code where re_id=? "
+						+" and msd_fsoncode<>cm_fsoncode and msd_stepcode=cm_stepcode and cm_firstsn=ms_firstsn)  and  nvl(cm_status,0)=0 ",ma_code,ma_id,re_id);
 			}
 		}
 		
@@ -1741,18 +1739,18 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 	
 	private void endMakeBase(int ma_id, String caller) {
 		// 只能对状态为[已审核]的订单进行结案操作!
-		Object[] status = baseDao.getFieldsDataByCondition("Make", new String[] { "ma_statuscode" }, "ma_id=" + ma_id);
+		Object[] status = baseDao.getFieldsDataByCondition("Make", new String[]{"ma_statuscode"}, "ma_id=" + ma_id);
 		if (!"STARTED".equals(status[0])) {
 			BaseUtil.showError("只能对状态为[已下放]的单进行结案操作!");
 		}
 		// 执行结案前的其它逻辑
-		handlerService.handler(caller, "end", "before", new Object[] { ma_id });
+		handlerService.handler(caller, "end", "before", new Object[]{ma_id});
 		// 执行结案操作
 		baseDao.updateByCondition("Make", "ma_statuscode='FINISH', ma_status='" + BaseUtil.getLocalMessage("FINISH") + "',ma_actenddate=" + DateUtil.parseDateToOracleString(null, new Date()), "ma_id=" + ma_id);
 		// 记录操作
 		baseDao.logMessage(new MessageLog(SystemSession.getUser().getEm_name(), BaseUtil.getLocalMessage("msg.end"), BaseUtil.getLocalMessage("msg.endSuccess"), "Make!Base|ma_id=" + ma_id));
 		// 执行结案后的其它逻辑
-		handlerService.handler(caller, "end", "after", new Object[] { ma_id });
+		handlerService.handler(caller, "end", "after", new Object[]{ma_id});
 	}
 
 	@Override