root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
zds
2022-06-28 09:44:28 +08:00
parent c7c3ad55de
commit 668a64ad6c
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
View File

@@ -52,6 +52,14 @@ public class WorkTaskServiceImpl implements WorkTaskService {
if (StrUtil.isNotEmpty(worktask_code)) {
map.put("worktask_code", "%" + worktask_code + "%");
}
String begin_time = map.get("begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = map.get("end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
JSONObject json = WQL.getWO("QPDM_WORKTASK01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkTask.worktask_code");
return json;
}
@@ -311,14 +319,14 @@ public class WorkTaskServiceImpl implements WorkTaskService {
JSONArray Formulas = PDM_BI_Formula.query("is_delete='0' and status<>'99' and workorder_id ='" + jsonMst.getString("workorder_id") + "' and material_id='"+jsonMst.getString("material_id")+"'").getResultJSONArray(0);
for(int j=0;j<Formulas.size();j++){
JSONObject Formulas_jo = Formulas.getJSONObject(j);
Formulas_jo.put("status","99");
Formulas_jo.put("finish_type", "02");
Formulas_jo.put("end_id", currentUserId + "");
Formulas_jo.put("end_name", nickName);
Formulas_jo.put("end_time", now);
Formulas_jo.put("confirm_type", "00");
PDM_BI_Formula.update(Formulas_jo);
JSONObject Formulas_jo = Formulas.getJSONObject(j);
Formulas_jo.put("status","99");
Formulas_jo.put("finish_type", "02");
Formulas_jo.put("end_id", currentUserId + "");
Formulas_jo.put("end_name", nickName);
Formulas_jo.put("end_time", now);
Formulas_jo.put("confirm_type", "00");
PDM_BI_Formula.update(Formulas_jo);
JSONArray FormulaDtls = PDM_BI_FormulaDtl.query("status<>'99' and formula_id='"+Formulas_jo.getString("formula_id")+"'").getResultJSONArray(0);
for(int m=0;m<FormulaDtls.size();m++){