预加工报工

src/com/uas/mes/api/pdashop/controller/StartController.java

@@ -17,6 +17,9 @@ import com.uas.erp.model.Employee;
 import com.uas.mes.api.core.BaseApiController;
 import com.uas.mes.api.pdashop.service.Impl.StartServiceImpl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController("api.StartController")
 @RequestMapping("/api/pdashop/start")
 public class StartController extends BaseApiController{
@@ -171,16 +174,17 @@ public class StartController extends BaseApiController{
 	}
 
 	@RequestMapping(value="/modifyMaProds.action" , method = RequestMethod.GET)
-	public ModelMap modifyMaProds (HttpServletRequest request,String ma_code,String sc_code,String prods){
+	public Map<String, Object> modifyMaProds (HttpServletRequest request,String ma_code,String sc_code,String prods,String decode,String reportqty){
 		Employee employee = (Employee) request.getSession().getAttribute(
 				"employee");
+		Map<String, Object> modelMap = new HashMap<String, Object>();
 		if (employee == null)
 			BaseUtil.showError("会话已断开!");
 		if (StringUtils.isEmpty(ma_code))
 			throw new APIErrorException(APIErrorCode.ILLEGAL_ARGUMENTS, "制造单号不能为空");
 		if (StringUtils.isEmpty(sc_code))
 			throw new APIErrorException(APIErrorCode.ILLEGAL_ARGUMENTS, "岗位资源不能为空");
-		return success(startService.modifyMaProds(ma_code,sc_code,prods));
+		modelMap.put("data", startService.modifyMaProds(ma_code,sc_code,prods,decode,reportqty));
+		return modelMap;
 	}
-
 }

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

@@ -1,5 +1,7 @@
 package com.uas.mes.api.pdashop.service.Impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -181,10 +183,27 @@ public class StartServiceImpl implements StartService{
 	}
 
 	@Override
-	public String modifyMaProds(String ma_code, String sc_code, String prods) {
+	public List<Map<String ,Object>> modifyMaProds(String ma_code, String sc_code, String prods,String decode,String reportqty) {
+		List<Map<String,Object>> rlist = new ArrayList<Map<String,Object>>();
+		String barcode = baseDao.callProcedure("SP_GETBARCODE", new Object[] { "", "" }).substring(8);
 		baseDao.updateByCondition("make","ma_prodcodes='"+prods+"'","ma_code='"+ma_code+"'");
-		return "保存成功！";
+		baseDao.execute("insert into BEFOREHANDPROCESS(bhp_id,bhp_barcode,bhp_prodcode,bhp_makecode,bhp_inman)" +
+				"values(BEFOREHANDPROCESS_seq.nextval,'"+barcode+"','"+prods+"','"+ma_code+"','"+sc_code+"')");
+		Object obj=baseDao.getFieldDataByCondition("source","sc_linecode","sc_code='"+sc_code+"'");
+		Map<String,Object> mapr = new HashMap<String, Object>();
+		SqlRowList rs=baseDao.queryForRowSet("select to_char(sysdate,'yyyy-mm-dd hh24:Mi:ss')printdate,ma_salecode,pr_spec,pr_detail,pr_code from make left join product on pr_code=ma_prodcode where ma_code='"+ma_code+"'");
+		if(rs.next()){
+			mapr.put("MA_CODE","工单号:"+ ma_code);
+			mapr.put("MA_SALECODE","销售订单号:"+  rs.getString("ma_salecode"));
+			mapr.put("PR_SPEC","名称:"+ rs.getString("pr_spec"));
+			mapr.put("BAR_REMAIN","数量:"+ reportqty);
+			mapr.put("PRINTDATE","报工时间:"+ rs.getString("printdate"));
+			mapr.put("STATUS","前加工完成");
+			mapr.put("LINECODE",obj.toString());
+			mapr.put("PR_CODE","使用料号:"+ prods);
+			mapr.put("BAR_CODE",barcode);
+			rlist.add(mapr);
+		}
+		return rlist;
 	}
-
-
 }

src/com/uas/mes/api/pdashop/service/StartService.java

@@ -21,5 +21,5 @@ public interface StartService {
 
 	List<Map<String, Object>>getMakeMaterial(String ma_code, String sc_code);
 
-	String modifyMaProds(String ma_code, String sc_code, String prods);
+	List<Map<String ,Object>> modifyMaProds(String ma_code, String sc_code, String prods,String decode,String reportqty);
 }