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

代码更新

Browse Source
This commit is contained in:
lyd
2022-10-31 15:31:56 +08:00
parent 1f13b2a218
commit 22e4231a93
9 changed files with 35 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
View File

@@ -18,6 +18,8 @@ package org.nl.modules.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.NotFound;
import org.hibernate.annotations.NotFoundAction;
import org.nl.base.BaseEntity;
import javax.persistence.*;
@@ -62,6 +64,7 @@ public class User extends BaseEntity implements Serializable {
@OneToOne
@JoinColumn(name = "dept_id")
@NotFound(action= NotFoundAction.IGNORE)
@ApiModelProperty(value = "用户部门")
private Dept dept;

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
View File

@@ -284,7 +284,7 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
map.put("material_id", material_id);
map.put("is_full", is_full);
map.put("ivt_workprocedure_id", ivt_workprocedure_id);
JSONObject json = WQL.getWO("ST_WorkprocedureiosOut_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "structivt.pcsn desc");
JSONObject json = WQL.getWO("ST_WorkprocedureiosOut_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "structivt.stockrecord_id desc");
return json;
}

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql
View File

@@ -49,7 +49,6 @@
c.material_name,
p1.point_name AS start_point_name,
p2.point_name AS end_point_name,
unit.unit_name,
cust.cust_name
FROM
ST_IVT_workProcedureIOS a
@@ -57,7 +56,6 @@
LEFT JOIN md_me_material c ON c.material_id = a.material_id
LEFT JOIN sch_base_point p1 ON a.start_point_code = p1.point_code
LEFT JOIN sch_base_point p2 ON a.end_point_code = p2.point_code
LEFT JOIN md_pb_measureunit unit ON a.qty_unit_id = unit.unit_id
LEFT JOIN md_cs_customerbase cust ON a.cust_id = cust.cust_id
WHERE
a.is_delete = '0' and a.io_type = '1'