[行之成EIS]调整点料机对接接口

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

@@ -785,16 +785,16 @@ 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 from barcode@ERP where bar_code=?",ReelId);
+		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(bar_madedate,'yyyy-mm-dd')bar_madedate from barcode@ERP left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
 		if(rs.next()){
-			baseDao.execute("update barcode@ERP set bar_remain=? where bar_id=?",Quantity,rs.getString("bar_id"));
+			baseDao.execute("update barcode@ERP set bar_remain=?,bar_status = 1,bar_outno = '' where bar_id=?",Quantity,rs.getString("bar_id"));
 			baseDao.execute("insert into barcodechange@ERP(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
-					"values(barcodechange_seq.nextval@erp,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
+					"values(barcodechange_seq.nextval@ERP,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
 			rmap.put("Status","OK");
 			rmap.put("Meassage","通过");
-			rmap.put("PN","");
-			rmap.put("MPN","");
-			rmap.put("DataCode","");
+			rmap.put("PN",rs.getString("bar_prodcode"));
+			rmap.put("MPN",rs.getString("pr_spec"));
+			rmap.put("DataCode",rs.getString("bar_madedate"));
 		}else {
 			rmap.put("Status","NG");
 			rmap.put("Meassage","条码不存在");