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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-04 11:03:52 +08:00
parent 3f56bd478e
commit 8e21813b1d
6 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -410,7 +410,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
@Override
public Map<String, Object> confirmOutStore2(Map<String, String> jsonObject) {
String input_optid = MapUtil.getStr(jsonObject, "input_optid");
String input_optname = MapUtil.getStr(jsonObject, "input_optid");
String input_optname = MapUtil.getStr(jsonObject, "input_optname");
Long currentUserId = SecurityUtils.getCurrentUserId();
UserDto userDto = userService.findById(currentUserId);
// 仓位属性表【ST_IVT_StructAttr】
@@ -556,8 +556,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
invrow.put("input_optid", input_optid);
invrow.put("input_optname", input_optname);
invrow.put("input_time", now);
invrow.put("update_optid", currentUserId);
invrow.put("update_optname", userDto.getNickName());
invrow.put("update_optid", input_optid);
invrow.put("update_optname", input_optname);
invrow.put("update_time", now);
invrow.put("dis_optid", currentUserId);
invrow.put("dis_optname", userDto.getNickName());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
View File

@@ -59,6 +59,7 @@ public class FlourworkServiceImpl implements FlourworkService {
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String is_all = MapUtil.getStr(whereJson, "is_all");
String biz_date = MapUtil.getStr(whereJson, "biz_date");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("device_id", MapUtil.getStr(whereJson, "device_id"));
@@ -68,6 +69,7 @@ public class FlourworkServiceImpl implements FlourworkService {
map.put("status", is_all);
}
if (StrUtil.equals(is_all, "0")) map.put("status", "99");
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%");
JSONObject json = WQL.getWO("QPDM_BI_FORMULA01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "fMst.status,task.start_time,fMst.bucket_type ASC");
return json;
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql
View File

@@ -16,6 +16,7 @@
输入.flag TYPEAS s_string
输入.biz_date TYPEAS s_string
输入.device_id TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.status TYPEAS s_string
输入.formula_id TYPEAS s_string
输入.formuladtl_id TYPEAS s_string
@@ -87,6 +88,7 @@
fMst.end_name,
der.workordercard_id,
device.device_code,
device.device_name,
device.device_id,
fMst.formula_id,
@@ -113,6 +115,10 @@
task.device_id = 输入.device_id
ENDOPTION
OPTION 输入.pcsn <> ""
fMst.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.status <> "1"
fMst.status <> 输入.status
ENDOPTION

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java
View File

@@ -56,7 +56,7 @@ public class ProductionDayQueryServiceImpl implements ProductionDayQueryService
JSONArray arr = WQL.getWO("QP_WORKTASKJOB01").addParam("flag", "3").addParam("workorder_id", workorder_id).process().getResultJSONArray(0);
for (int j = 0; j < arr.size(); j++) {
JSONObject jsonObject = arr.getJSONObject(j);
jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("end_name"));
jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("create_name"));
jsonResult.put(jsonObject.getString("workprocedure_id") + "planstart_time"+"",jsonObject.getString("planstart_time"));
jsonResult.put(jsonObject.getString("workprocedure_id") + "start_time"+"",jsonObject.getString("start_time"));
}