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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
zds
2022-12-27 16:12:00 +08:00
parent 6d26ef52e9 c019451aa6
commit c092970a8f
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
json.put("create_time", now);
json.put("sysdeptid", deptId);
json.put("syscompanyid", deptId);
json.put("is_out",ObjectUtil.isNotEmpty(json.get("send_date"))?"1":"0");
String planstart_time = json.getString("planstart_time");
Date date = DateUtil.parse(planstart_time);
int days = this.getDays(json.getString("material_id"));
@@ -169,6 +170,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isEmpty(product_series_id)) {
throw new BadRequestException("工令对应产品系列不能为空！");
}
whereJson.put("is_out",ObjectUtil.isNotEmpty(whereJson.get("send_date"))?"1":"0");
whereJson.put("update_optid", currentUserId);
whereJson.put("update_optname", nickName);
whereJson.put("update_time", now);