修改允许本工单物料上料

src/com/uas/mes/api/pdashop/service/Impl/LoadingServiceImpl.java

@@ -192,11 +192,17 @@ public class LoadingServiceImpl implements LoadingService{
 						+ " where MM_CODE  in (select dl_macode from  deviceline where dl_macodes = (select dl_macodes from deviceline where dl_macode='"+ma_code+"' and DL_SOURCECODE='"+sc_code+"') "
 						+" and DL_SOURCECODE='"+sc_code+"' and nvl(dl_macodes,' ')<>' '  union select '"+ma_code+"' dl_macode from dual)  AND MP_PRODCODE='"+prodCode+"'"
 						+" and mm_oneuseqty>0 group by ma_code,ma_id,mm_prodcode,ma_craftcode ");
+			}else if (baseDao.checkIf("make","ma_code='"+ma_code+"' and ma_prodcode='"+prodCode+"'")){
+				rs = baseDao.queryForRowSet("select ma_code,ma_id,ma_prodcode,ma_craftcode,sum(mm_oneuseqty) mm_oneuseqty"
+						+ " from makematerial left join make on mm_maid=ma_id LEFT JOIN MAKEMATERIALREPLACE ON MP_MMID=MM_ID"
+						+ " where MM_CODE  in (select dl_macode from  deviceline where dl_macodes = (select dl_macodes from deviceline where dl_macode='"+ma_code+"' and DL_SOURCECODE='"+sc_code+"') "
+						+" and DL_SOURCECODE='"+sc_code+"' and nvl(dl_macodes,' ')<>' '  union select '"+ma_code+"' dl_macode from dual)  AND ma_prodcode='"+prodCode+"'"
+						+" and mm_oneuseqty>0 group by ma_code,ma_id,ma_prodcode,ma_craftcode ");
 			}else{//如果物料或者半成品既不属于工单用料表中的主料也不属于替代料则，提示用户：“物料：xxx ，不是工单用料表需要上料的数据”
 				throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"物料："+prodCode+" ，不是工单用料表需要上料的数据！");
 			}
 			//如果属于用料表中的物料则进行上料操作 ma_id mm_prodcode ma_craftcode mm_oneuseqty
-			//MSS_BASEQTY - mm_oneuseqty 单位用量
+			//MSS_BASEQTY - mm_oneuseqty 单位用量 123
 			//MSS_PRODCODE 实际物料 prodCode（mm_prodcode/MP_PRODCODE）
 			//mss_fprodcode - mm_prodcode 物料明细物料 
 			while(rs.next()){