From f138b214e4bcdeb987f2c9a258adc142497cee9c Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 14 Jun 2024 17:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/board/controller/BoardController.java | 50 ++++++++++ .../nl/wms/board/service/BoardService.java | 10 ++ .../nl/wms/board/service/dao/dto/Detail.java | 14 +++ .../nl/wms/board/service/dao/dto/KCDto.java | 12 +++ .../nl/wms/board/service/dao/dto/KCFX.java | 9 ++ .../nl/wms/board/service/dao/dto/Point.java | 10 ++ .../wms/board/service/dao/dto/PointDto.java | 11 +++ .../org/nl/wms/board/service/dao/dto/QS.java | 9 ++ .../nl/wms/board/service/dao/dto/Today.java | 11 +++ .../board/service/dao/mapper/BoardMapper.java | 19 ++++ .../board/service/dao/mapper/BoardMapper.xml | 92 +++++++++++++++++++ .../board/service/impl/BoardServiceImpl.java | 42 +++++++++ .../wms/sch/point/service/task/SyncPoint.java | 45 +++++++-- 13 files changed, 327 insertions(+), 7 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Detail.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCFX.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Point.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/PointDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/QS.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Today.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java new file mode 100644 index 0000000..0d72888 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/controller/BoardController.java @@ -0,0 +1,50 @@ +package org.nl.wms.board.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.board.service.BoardService; +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +@Slf4j +@RestController +@Api(tags = "看板接口") +@RequestMapping("/api/board" + + "") +@SaIgnore +@Lazy +public class BoardController { + + @Resource + private BoardService boardService; + + + @PostMapping("/point") + @Log("点位详情") + @ApiOperation("点位详情") + @SaIgnore + public ResponseEntity point(){ + return new ResponseEntity<>(boardService.point(), HttpStatus.OK); + } + + @PostMapping("/kc") + @Log("库存状态") + @ApiOperation("库存状态") + @SaIgnore + public ResponseEntity kc(){ + return new ResponseEntity<>(boardService.kc(), HttpStatus.OK); + } + + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java new file mode 100644 index 0000000..3f325bf --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/BoardService.java @@ -0,0 +1,10 @@ +package org.nl.wms.board.service; + +import com.alibaba.fastjson.JSONObject; + +public interface BoardService { + JSONObject point(); + + JSONObject kc(); + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Detail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Detail.java new file mode 100644 index 0000000..8fcce0b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Detail.java @@ -0,0 +1,14 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +@Data +public class Detail { + private Integer sum1; + private Integer use1; + private Integer empty1; + + private Integer sum2; + private Integer use2; + private Integer empty2; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCDto.java new file mode 100644 index 0000000..72e6fac --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCDto.java @@ -0,0 +1,12 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class KCDto { + private List kcfx; + private List qs; + private List today; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCFX.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCFX.java new file mode 100644 index 0000000..58402fd --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KCFX.java @@ -0,0 +1,9 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +@Data +public class KCFX { + private String material_name; + private Integer sum; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Point.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Point.java new file mode 100644 index 0000000..d3b834c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Point.java @@ -0,0 +1,10 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +@Data +public class Point { + private String point_code; + private String material_name; + private String point_status; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/PointDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/PointDto.java new file mode 100644 index 0000000..e2e502b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/PointDto.java @@ -0,0 +1,11 @@ +package org.nl.wms.board.service.dao.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class PointDto { + private Detail detail; + private List pointList; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/QS.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/QS.java new file mode 100644 index 0000000..85ddc6c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/QS.java @@ -0,0 +1,9 @@ +package org.nl.wms.board.service.dao.dto; +import lombok.Data; + +@Data +public class QS { + private String direction; + private String date; + private Integer num; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Today.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Today.java new file mode 100644 index 0000000..2b4f4ba --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/Today.java @@ -0,0 +1,11 @@ +package org.nl.wms.board.service.dao.dto; +import lombok.Data; + +@Data +public class Today { + private String time; + private String point_code; + private String material_name; + private String direction; + private String number; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java new file mode 100644 index 0000000..cdcf9ac --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java @@ -0,0 +1,19 @@ +package org.nl.wms.board.service.dao.mapper; + +import org.nl.wms.board.service.dao.dto.*; + +import java.util.List; + +public interface BoardMapper { + + Detail detail(); + + List point(); + + List kcfx(); + + List qs(); + + List today(); + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml new file mode 100644 index 0000000..4191a6f --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java new file mode 100644 index 0000000..fd33511 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java @@ -0,0 +1,42 @@ +package org.nl.wms.board.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.RedisUtils; +import org.nl.wms.board.service.BoardService; +import org.nl.wms.board.service.dao.dto.*; +import org.nl.wms.board.service.dao.mapper.BoardMapper; +import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class BoardServiceImpl implements BoardService { + @Autowired + private BoardMapper boardMapper; + @Autowired + private ISchBasePointService pointService; + + public JSONObject point() { + PointDto pointDto = new PointDto(); + pointDto.setPointList(boardMapper.point()); + pointDto.setDetail(boardMapper.detail()); + return JSONObject.parseObject(JSON.toJSONString(pointDto, SerializerFeature.WriteNullStringAsEmpty)); + } + + public JSONObject kc() { + KCDto kcdto = new KCDto(); + kcdto.setKcfx(boardMapper.kcfx()); + kcdto.setQs(boardMapper.qs()); + kcdto.setToday(boardMapper.today()); + return JSONObject.parseObject(JSON.toJSONString(kcdto, SerializerFeature.WriteNullStringAsEmpty)); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java index 949d778..65e1ce6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java @@ -1,13 +1,21 @@ package org.nl.wms.sch.point.service.task; +import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.RedisUtils; +import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService; +import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking; +import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; +import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; +import org.nl.wms.util.TaskUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -24,6 +32,11 @@ public class SyncPoint { @Autowired private ISchBasePointService schBasePointService; + @Autowired + private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; + @Autowired + private IPdmBdProductionProcessTrackingService processTrackingService; + public void run() throws Exception { try { @@ -40,14 +53,32 @@ public class SyncPoint { List schBasePointList = schBasePointService.getPointList(schBasePoint); JSONArray jsonArray = JSONArray.parseArray(result.body()); for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jsonObject=jsonArray.getJSONObject(i); - for(SchBasePoint temp:schBasePointList){ - if (temp.getPoint_code().equals(jsonObject.getString("binNo"))){ - if(jsonObject.getInteger("pred")==0&&"2".equals(temp.getPoint_status()) - ||jsonObject.getInteger("pred")==1&&"1".equals(temp.getPoint_status())){ - log.info("检测到点位{}当前库存有变动pred={}，更新lms库存",jsonObject.getString("binNo"),jsonObject.getInteger("pred")); - temp.setPoint_status(String.valueOf(jsonObject.getInteger("pred")+1)); + JSONObject jsonObject = jsonArray.getJSONObject(i); + for (SchBasePoint temp : schBasePointList) { + if (temp.getPoint_code().equals(jsonObject.getString("binNo"))) { + if (jsonObject.getInteger("pred") == 0 && "2".equals(temp.getPoint_status()) + || jsonObject.getInteger("pred") == 1 && "1".equals(temp.getPoint_status())) { + log.info("检测到点位{}当前库存有变动pred={}，更新lms库存", jsonObject.getString("binNo"), jsonObject.getInteger("pred")); + temp.setPoint_status(String.valueOf(jsonObject.getInteger("pred") + 1)); + temp.setVehicle_type(""); + temp.setVehicle_code(""); + temp.setIng_task_code(""); + temp.setVehicle_qty(0); + temp.setUpdate_time(DateUtil.now()); schBasePointService.update(temp); + SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getVehicleGroupInfo( + temp.getVehicle_code(), + temp.getVehicle_type(), + GroupBindMaterialStatusEnum.BOUND.getValue()); + groupInfo.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); + vehiclematerialgroupService.update(groupInfo); + // 插入生产过程跟踪表 + PdmBdProductionProcessTracking processTracking = new PdmBdProductionProcessTracking(); + processTracking.setBuss_move_id(groupInfo.getBuss_move_id()); + processTracking.setProcess_action("暂存区人工出库"); + processTracking.setProcess_location(temp.getPoint_code()); + processTracking.setRecord_time(DateUtil.now()); + processTrackingService.create(processTracking); break; } }