|
|
@@ -651,6 +651,28 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
@Override
|
|
|
public Map<Object,Object> LoadCraftMaterial(String data) {
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ JSONObject object = JSONObject.fromObject(data);
|
|
|
+ String SN=object.get("iSN");
|
|
|
+ String SC_CODE=object.get("iSource");
|
|
|
+ JSONArray CraftMaterial=object.getJSONArray("craftmaterial");
|
|
|
+
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select max(sp_id)sp_id,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,max(sp_checkbarcode)sp_checkbarcode,min(sp_checksalecode)sp_checksalecode,\n" +
|
|
|
+ "sp_fsoncode,max(sp_barcoderule)sp_barcoderule,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)\n" +
|
|
|
+ "sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)\n" +
|
|
|
+ "sp_regex,max(pr_detail)pr_detail,max(substr(pr_spec,0,20))pr_spec from stepproduct left join product on pr_code=sp_fsoncode where\n" +
|
|
|
+ "sp_bomversion='"+ms_bomversion+"' and sp_craftcode='"+ms_craftcode+"' and sp_stepcode='"+stepcode+"'\n" +
|
|
|
+ "And sp_mothercode ='"+ms_prodcode+"' and sp_tracekind=1 and not exists(select 1 from craftmaterial where \n" +
|
|
|
+ "cm_sncode in (select '"+ms_firstsn+"' from dual union select sn from makesnrelation where firstsn='"+ms_firstsn+"') \n" +
|
|
|
+ "and cm_makecode='"+ms_makecode+"' and cm_fsoncode=\n" +
|
|
|
+ "sp_fsoncode and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
|
|
|
+ if(rs.size()!=CraftMaterial.size()){
|
|
|
+ oErrMessage = "上料条码数量"+CraftMaterial.size()+"和当前工位需上料数量不符"+rs.size();
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ for (int i=0;i<CraftMaterial.size();i++){
|
|
|
+
|
|
|
+ }
|
|
|
return rmap;
|
|
|
}
|
|
|
|
