mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产领料修改

Browse Source
This commit is contained in:
JinLu.Yin 2022-07-25 15:20:09 +08:00
parent 4d525cfd0e
commit 79f3dde766
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java
View File

@ -18,7 +18,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/mobile/pro/taskissue")
@ -69,7 +71,17 @@ public class ProTaskIssueMobController extends BaseController {
List<WmIssueHeader> issueList = wmIssueHeaderService.selectWmIssueHeaderList(param);
return AjaxResult.success(issueList);
List<WmIssueLine> lines = new ArrayList<WmIssueLine>();
if(CollUtil.isNotEmpty(issueList)){
WmIssueLine p = new WmIssueLine();
for (WmIssueHeader header: issueList
) {
p.setIssueId(header.getIssueId());
lines.addAll(wmIssueLineService.selectWmIssueLineList(p));
}
}
return AjaxResult.success(lines);
}
/**

11
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
View File

@ -161,7 +161,15 @@ public class WmIssueHeader extends BaseEntity
this.workorderId = workorderId;
}
public Long getWorkorderId()
public String getWorkstationName() {
return workstationName;
}
public void setWorkstationName(String workstationName) {
this.workstationName = workstationName;
}
public Long getWorkorderId()
{
return workorderId;
}
@ -336,6 +344,7 @@ public class WmIssueHeader extends BaseEntity
.append("issueName", getIssueName())
.append("workstationId", getWorkstationId())
.append("workstationCode", getWorkstationCode())
.append("workstationName", getWorkstationName())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())
.append("taskId", getTaskId())

2
ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
View File

@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmIssueHeaderVo">
select issue_id, issue_code, issue_name, workstation_id, workstation_code, workorder_id, workorder_code, task_id, task_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
select issue_id, issue_code, issue_name, workstation_id, workstation_code,workstation_name, workorder_id, workorder_code, task_id, task_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
</sql>
<select id="selectWmIssueHeaderList" parameterType="WmIssueHeader" resultMap="WmIssueHeaderResult">