Merge remote-tracking branch 'origin/mes_malata_prod' into mes_malata_prod

src/com/uas/mes/pda/service/impl/PdaBatchServiceImpl.java

@@ -80,13 +80,13 @@ public class PdaBatchServiceImpl implements PdaBatchService {
 		if (rs0.next() && rs0.getString("ms_action").equals("入烘烤")) {
 			throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码：" + or_barcode + "，状态为在烘烤，请先出烘烤再拆分!");
 		}
-		rs0 = baseDao.queryForRowSet("select barcode.*,pr_detail,pr_spec,ve_name,nvl(pr_msdlevel,'无') pr_msdlevel from barcode left join vendor on ve_code = bar_vendcode left join product on pr_code = bar_prodcode where bar_code=? and bar_status=1",or_barcode);
+		rs0 = baseDao.queryForRowSet("select barcode.*,pr_detail,pr_spec,ve_name,nvl(pr_msdlevel,'无') pr_msdlevel,pr_ismsd from barcode left join vendor on ve_code = bar_vendcode left join product on pr_code = bar_prodcode where bar_code=? and bar_status=1",or_barcode);
 		if (rs0.next()) {
 			Map<String, Object> mp1 = rs0.getCurrentMap();
 			int or_barid = Integer.valueOf(mp1.get("bar_id").toString());
 			// 更新原barcode表，锁定该条码正在拆分，不允许同时操作
 			baseDao.updateByCondition("Barcode", "bar_status=-1", "bar_id='" + or_barid + "'");
-			if (NumberUtil.isEmpty(mp1.get("pr_ismsd"))  && !mp1.get("pr_msdlevel").equals("无")) {
+			if (!NumberUtil.isEmpty(mp1.get("pr_ismsd"))  && !mp1.get("pr_msdlevel").equals("无")) {
 				// 湿敏等级不为“无”
 				ismsd = true;
 				level = mp1.get("pr_msdlevel").toString();