优化erp超链接

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -792,11 +792,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		ReelId=map.get("ReelId").toString();
 		Quantity=map.get("Quantity").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(nvl(bar_madedate,sysdate),'yyyy-mm-dd')bar_madedate from barcode left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
+		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(nvl(bar_madedate,sysdate),'yyyy-mm-dd')bar_madedate,bar_vendcode,bar_vendbarcode,pr_detail from barcode left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
 		if(rs.next()){
-			baseDao.execute("update barcode@ERP_JMDZ_HF set bar_remain=?,bar_status = 2 where bar_id=?",Quantity,rs.getString("bar_id"));
+			/*baseDao.execute("update barcode@ERP_JMDZ_HF set bar_remain=?,bar_status = 2 where bar_id=?",Quantity,rs.getString("bar_id"));
 			baseDao.execute("insert into barcodechange@ERP_JMDZ_HF(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
-					"values(barcodechange_seq.nextval@ERP_JMDZ_HF,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
+					"values(barcodechange_seq.nextval@ERP_JMDZ_HF,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);*/
 			baseDao.execute("update barcode set bar_remain=?,bar_status = 1,bar_outno = '' where bar_code=?",Quantity,ReelId);
 			baseDao.execute("insert into barcodechange(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
 					"values(barcodechange_seq.nextval,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
@@ -805,6 +805,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("PN",rs.getString("bar_prodcode"));
 			rmap.put("MPN",rs.getString("pr_spec"));
 			rmap.put("DataCode",rs.getString("bar_madedate"));
+
+			rmap.put("VENDCODE",rs.getString("bar_vendcode") != null ? rs.getString("bar_vendcode") : "");
+			rmap.put("VENDBARCODE",rs.getString("bar_vendbarcode") != null ? rs.getString("bar_vendbarcode") : "");
+			rmap.put("PRDETAIL",rs.getString("pr_detail") != null ? rs.getString("bar_vendbarcode") : "");
 		}else {
 			rmap.put("Status","NG");
 			rmap.put("Meassage","条码不存在");