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

rev:盘点任务下发修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-03 11:30:41 +08:00
parent a5fd09c00c
commit f0bb0cc61a
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java
View File

@@ -6,6 +6,7 @@ import lombok.Getter;
import org.nl.common.enums.AcsTaskEnum;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService;
import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckmstBcpService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframeinvBcpService;
@@ -25,7 +26,7 @@ public enum TASKEnum implements FunctionStrategy<String, JSONObject> {
bean.taskOperate(form);
}),
CHECK_TASK(type -> AcsTaskEnum.TASK_STRUCT_CHECK.getCode().equals(type), form -> {
IStIvtCheckmstYlService bean = SpringContextHolder.getBean(IStIvtCheckmstYlService.class);
IStIvtCheckmstBcpService bean = SpringContextHolder.getBean(IStIvtCheckmstBcpService.class);
bean.taskOperate(form);
}),
SHUT_TASK(type -> AcsTaskEnum.TASK_STRUCT_SHUT.getCode().equals(type), form -> {

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java
View File

@@ -89,6 +89,14 @@ public class StIvtCheckmstBcpController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/issueTask")
@Log("下发任务")
@ApiOperation("下发任务")
public ResponseEntity<Object> issueTask(@RequestBody JSONObject whereJson) {
checkmstBcpService.issueTask(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/process0")
@Log("账务为准")
@ApiOperation("账务为准")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/StIvtCheckdtlBcpMapper.java
View File

@@ -18,4 +18,6 @@ import java.util.Map;
public interface StIvtCheckdtlBcpMapper extends BaseMapper<StIvtCheckdtlBcp> {
List<Map> getCheckDtl(@Param("map") Map map);
List<StIvtCheckdtlBcp> queryCheckDtlByTask(@Param("map") Map map);
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
View File

@@ -35,4 +35,16 @@
</where>
order by CheckDtl.seq_no
</select>
<select id="queryCheckDtlByTask" resultType="org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp">
SELECT
dtl.*
FROM
sch_base_task task
LEFT JOIN st_ivt_structattr sa ON sa.struct_code = task.point_code2
LEFT JOIN st_ivt_checkdtl_bcp dtl ON dtl.struct_id = sa.struct_id
<where>
task.task_id = #{map.task_id}
</where>
</select>
</mapper>

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
View File

@@ -18,6 +18,7 @@ import org.nl.common.enums.AcsTaskEnum;
import org.nl.common.publish.BussEventMulticaster;
import org.nl.common.publish.event.PointEvent;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
@@ -29,6 +30,7 @@ import org.nl.wms.storage_manage.CHECKEnum;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp;
import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckdtlBcpMapper;
import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.semimanage.MLEnum;
import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckdtlBcpService;
@@ -70,6 +72,8 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
private IStIvtStructattrService structattrService;
@Autowired
private IStIvtMoreorlessmstBcpService moreorlessmstBcpService;
@Autowired
private StIvtCheckdtlBcpMapper checkdtlBcpMapper;
@Override
public Object pageQuery(CheckQuery query, PageQuery page) {
@@ -298,7 +302,8 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
public void taskOperate(JSONObject form) {
String task_id = form.getString("task_id");
String status = form.getString("status");
StIvtCheckdtlBcp dtl = new StIvtCheckdtlBcp();
List<StIvtCheckdtlBcp> dtl_list = checkdtlBcpMapper.queryCheckDtlByTask(MapOf.of("task_id", task_id));
StIvtCheckdtlBcp dtl = dtl_list.get(0);
if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode()) && dtl.getIs_down().equals("2")) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>()
.set("status", CHECKEnum.DTL_STATUS.code("完成"))