From fb3130e2e6dd31f2aa4e3ee16ae5fb6aeb8ba2eb Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 31 Jul 2023 11:33:15 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E8=AE=B0=E5=BD=95=E5=88=86=E6=8B=A3?= =?UTF-8?q?=E6=89=98=E7=9B=98=E5=AF=B9=E5=BA=94=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/doc/wms.xls | Bin 360960 -> 356864 bytes .../handler/GlobalExceptionHandler.java | 14 ++ .../FeedBackSplitPalletStationRequest.java | 48 +++++++ .../acs/service/impl/AcsToWmsServiceImpl.java | 55 ++++++-- .../PdmBdVehicleBindingController.java | 66 +++++++++ .../service/IPdmBdVehicleBindingService.java | 43 ++++++ .../service/dao/PdmBdVehicleBinding.java | 58 ++++++++ .../dao/mapper/PdmBdVehicleBindingMapper.java | 12 ++ .../dao/mapper/PdmBdVehicleBindingMapper.xml | 5 + .../service/dto/PdmBdVehicleBindingDto.java | 46 +++++++ .../service/dto/PdmBdVehicleBindingQuery.java | 12 ++ .../impl/PdmBdVehicleBindingServiceImpl.java | 67 ++++++++++ .../report/controller/ReportController.java | 8 ++ .../service/impl/SchBaseTaskServiceImpl.java | 2 +- .../task_manage/task/tasks/hn/HNMLTask.java | 20 +-- .../task/tasks/hn/mapper/HNMapper.java | 2 +- .../task/tasks/hn/mapper/HNMapper.xml | 2 +- .../task_manage/task/tasks/yz/YZQKTask.java | 4 +- .../src/views/wms/pdm/vehiclebiding/index.vue | 126 ++++++++++++++++++ .../pdm/vehiclebiding/pdmBdVehicleBinding.js | 27 ++++ 20 files changed, 596 insertions(+), 21 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackSplitPalletStationRequest.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java create mode 100644 lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/pdmBdVehicleBinding.js diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index 99dc07db1f483f64c8a81856eb2cebf8e9358fca..9f3fd9ea4d8af6c9560bfe4c2b2cc245423b5db7 100644 GIT binary patch delta 15749 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 YcTQqit_>F7$XJ>Ju0qXJE`b4(eO^Fer&J86$Gv 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 handleNullPointerException(NullPointerException ex) { + // 在这里处理空指针异常 + noticeService.createNotice("异常信息：" + ex.getMessage(), "空指针异常发", + NoticeTypeEnum.EXCEPTION.getCode()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("空指针异常发生了"); + } + /** * 处理所有不可知的异常 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackSplitPalletStationRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackSplitPalletStationRequest.java new file mode 100644 index 0000000..0be5f70 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackSplitPalletStationRequest.java @@ -0,0 +1,48 @@ +package org.nl.wms.ext.acs.service.dto.to.wms; + +import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; + +/** + * @Author: lyd + * @Description: 分拣反馈记录木托盘与钢托盘的绑定 + * @Date: 2023/7/31 + */ +@Data +public class FeedBackSplitPalletStationRequest extends BaseRequest { + + /** + * 取货点位 + */ + private String get_station; + + /** + * 放货点位 + */ + private String put_station; + + + /** + * 取货点位载具号 + */ + private String get_station_vehicle_code; + + + /** + * 放货点位载具号 + */ + private String put_station_vehicle_code; + + /** + * 取货点当前数量 + */ + private String get_station_qty; + + /** + * 放货点当前数量 + */ + private String put_station_qty; + + +} + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index f1c77e0..dbdf01a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.ext.acs.service.dto.*; import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; +import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackSplitPalletStationRequest; import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackTaskStatusRequest; import org.nl.wms.ext.acs.service.dto.to.wms.GetPalletizeRequest; import org.nl.wms.ext.acs.service.dto.to.BaseResponse; @@ -30,6 +31,8 @@ import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService; import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService; import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking; +import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; @@ -96,6 +99,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private RedissonClient redissonClient; @Autowired private IPdmBdMaterialResidueService materialResidueService; + @Autowired + private IPdmBdVehicleBindingService vehicleBindingService; @Override public BaseResponse acsApply(JSONObject param) { @@ -311,6 +316,38 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return requestNo; } + /** 分拣 - 记录钢托与木托的绑定 */ + public BaseResponse recordVehicleBiding(JSONObject param) { + FeedBackSplitPalletStationRequest request = param.toJavaObject(FeedBackSplitPalletStationRequest.class); + String getStation = request.getGet_station(); // 取货点 + String putStation = request.getPut_station(); // 放货点 + // 查找当前点位中的信息，如果acs没有提供，就获取点位上的数据，如果点位没有，则数据失效 + SchBasePoint pickupPoint = pointService.getById(getStation); + SchBasePoint putPoint = pointService.getById(putStation); + if (request.getGet_station_vehicle_code() == null) { + request.setGet_station_vehicle_code(pickupPoint.getVehicle_code()); + } + if (request.getPut_station_vehicle_code() == null) { + request.setPut_station_vehicle_code(putPoint.getVehicle_code()); + } + // 获取工单 + PdmBdWorkorder productionTask = workorderService.getDeviceProductionTask(pickupPoint.getParent_point_code()); + // 插入数据 + PdmBdVehicleBinding vehicleBinding = new PdmBdVehicleBinding(); + vehicleBinding.setOrigin_vehicle_code(request.getGet_station_vehicle_code()); + vehicleBinding.setOrigin_vehicle_type(pickupPoint.getVehicle_type()); + vehicleBinding.setOrigin_qty(request.getGet_station_qty()); + vehicleBinding.setTarget_vehicle_code(request.getPut_station_vehicle_code()); + vehicleBinding.setTarget_vehicle_type(putPoint.getVehicle_type()); + vehicleBinding.setTarget_qty(request.getPut_station_qty()); + if (productionTask != null) { + vehicleBinding.setOrder_code(productionTask.getWorkorder_code()); + } + vehicleBindingService.create(vehicleBinding); + return BaseResponse.responseOk(request.getRequestNo()); + + } + /** 反馈压机残留重量*/ public BaseResponse applyFeedbackWeight(JSONObject param) { ApplyTaskRequest applyTaskRequest = param.toJavaObject(ApplyTaskRequest.class); @@ -351,34 +388,36 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { /** 人工排产确认 */ public BaseResponse orderVerify(JSONObject param) { // 执行中 String requestNo = param.getString("requestNo"); - String workorderId = param.getString("workorder_id"); - if (workorderId == null) { + String workorderCode = param.getString("order_code"); + if (workorderCode == null) { return BaseResponse.responseError(requestNo, "工单标识不能为空!"); } - PdmBdWorkorder bdWorkorder = workorderService.getById(workorderId); + PdmBdWorkorder bdWorkorder = workorderService.getByCode(workorderCode); if (bdWorkorder == null) { return BaseResponse.responseError(requestNo, "物料信息为空!"); } bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.PRODUCING.getCode()); bdWorkorder.setRealproducestart_date(DateUtil.now()); - workorderService.update(bdWorkorder); + TaskUtils.setWorkOrderUpdateByAcs(bdWorkorder); + workorderService.updateById(bdWorkorder); return BaseResponse.responseOk(requestNo); } /** 工单完成 */ public BaseResponse orderFinish(JSONObject param) { // 完成 String requestNo = param.getString("requestNo"); - String workorderId = param.getString("workorder_id"); - if (workorderId == null) { + String workorderCode = param.getString("order_code"); + if (workorderCode == null) { return BaseResponse.responseError(requestNo, "工单标识不能为空!"); } - PdmBdWorkorder bdWorkorder = workorderService.getById(workorderId); + PdmBdWorkorder bdWorkorder = workorderService.getByCode(workorderCode); if (bdWorkorder == null) { return BaseResponse.responseError(requestNo, "物料信息为空!"); } bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.COMPLETE.getCode()); bdWorkorder.setRealproduceend_date(DateUtil.now()); - workorderService.update(bdWorkorder); + TaskUtils.setWorkOrderUpdateByAcs(bdWorkorder); + workorderService.updateById(bdWorkorder); return BaseResponse.responseOk(requestNo); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java new file mode 100644 index 0000000..faefb0e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java @@ -0,0 +1,66 @@ +package org.nl.wms.pdm.vehiclebiding.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; +/** +* @author lyd +* @date 2023-07-31 +**/ +@Slf4j +@RestController +@Api(tags = "分拣载具关联记录管理") +@RequestMapping("/api/pdmBdVehicleBinding") +public class PdmBdVehicleBindingController { + + @Autowired + private IPdmBdVehicleBindingService pdmBdVehicleBindingService; + + @GetMapping + @Log("查询分拣载具关联记录") + @ApiOperation("查询分拣载具关联记录") + //@SaCheckPermission("@el.check('pdmBdVehicleBinding:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdVehicleBindingService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增分拣载具关联记录") + @ApiOperation("新增分拣载具关联记录") + //@SaCheckPermission("@el.check('pdmBdVehicleBinding:add')") + public ResponseEntity create(@Validated @RequestBody PdmBdVehicleBinding entity){ + pdmBdVehicleBindingService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改分拣载具关联记录") + @ApiOperation("修改分拣载具关联记录") + //@SaCheckPermission("@el.check('pdmBdVehicleBinding:edit')") + public ResponseEntity update(@Validated @RequestBody PdmBdVehicleBinding entity){ + pdmBdVehicleBindingService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除分拣载具关联记录") + @ApiOperation("删除分拣载具关联记录") + //@SaCheckPermission("@el.check('pdmBdVehicleBinding:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + pdmBdVehicleBindingService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java new file mode 100644 index 0000000..5b93bf1 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java @@ -0,0 +1,43 @@ +package org.nl.wms.pdm.vehiclebiding.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-07-31 +**/ +public interface IPdmBdVehicleBindingService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(PdmBdVehicleBinding entity); + + /** + * 编辑 + * @param entity / + */ + void update(PdmBdVehicleBinding entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java new file mode 100644 index 0000000..d95462d --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java @@ -0,0 +1,58 @@ +package org.nl.wms.pdm.vehiclebiding.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-07-31 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bd_vehicle_binding") +public class PdmBdVehicleBinding implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "associate_id", type = IdType.NONE) + @ApiModelProperty(value = "对应标识") + private String associate_id; + + @ApiModelProperty(value = "源载具编码") + private String origin_vehicle_code; + + @ApiModelProperty(value = "源载具类型") + private String origin_vehicle_type; + + @ApiModelProperty(value = "目标载具编码") + private String target_vehicle_code; + + @ApiModelProperty(value = "目标载具类型") + private String target_vehicle_type; + + @ApiModelProperty(value = "源当前物料数量") + private String origin_qty; + + @ApiModelProperty(value = "目标当前物料数量") + private String target_qty; + + @ApiModelProperty(value = "取货点") + private String get_station; + + @ApiModelProperty(value = "放货点") + private String put_station; + + @ApiModelProperty(value = "工单号") + private String order_code; + + @ApiModelProperty(value = "记录时间") + private String record_time; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java new file mode 100644 index 0000000..b3d37a9 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.pdm.vehiclebiding.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; + +/** +* @author lyd +* @date 2023-07-31 +**/ +public interface PdmBdVehicleBindingMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml new file mode 100644 index 0000000..bc73a08 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java new file mode 100644 index 0000000..a0808ab --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java @@ -0,0 +1,46 @@ +package org.nl.wms.pdm.vehiclebiding.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-07-31 +**/ +@Data +public class PdmBdVehicleBindingDto implements Serializable { + + /** 对应标识 */ + private String associate_id; + + /** 源载具编码 */ + private String origin_vehicle_code; + + /** 源载具类型 */ + private String origin_vehicle_type; + + /** 目标载具编码 */ + private String target_vehicle_code; + + /** 目标载具类型 */ + private String target_vehicle_type; + + /** 源当前物料数量 */ + private String origin_qty; + + /** 目标当前物料数量 */ + private String target_qty; + + /** 取货点 */ + private String get_station; + + /** 放货点 */ + private String put_station; + + /** 工单号 */ + private String order_code; + + /** 记录时间 */ + private String record_time; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java new file mode 100644 index 0000000..e2b5584 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.pdm.vehiclebiding.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; + +/** +* @author lyd +* @date 2023-07-31 +**/ +public class PdmBdVehicleBindingQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java new file mode 100644 index 0000000..a615e5f --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java @@ -0,0 +1,67 @@ +package org.nl.wms.pdm.vehiclebiding.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService; +import org.nl.wms.pdm.vehiclebiding.service.dao.mapper.PdmBdVehicleBindingMapper; +import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author lyd +* @date 2023-07-31 +**/ +@Slf4j +@Service +public class PdmBdVehicleBindingServiceImpl extends ServiceImpl implements IPdmBdVehicleBindingService { + + @Autowired + private PdmBdVehicleBindingMapper pdmBdVehicleBindingMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pdmBdVehicleBindingMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(PdmBdVehicleBinding entity) { + String now = DateUtil.now(); + entity.setAssociate_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setRecord_time(now); + pdmBdVehicleBindingMapper.insert(entity); + } + + @Override + public void update(PdmBdVehicleBinding entity) { + PdmBdVehicleBinding dto = pdmBdVehicleBindingMapper.selectById(entity.getAssociate_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + String now = DateUtil.now(); + entity.setRecord_time(now); + + pdmBdVehicleBindingMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + pdmBdVehicleBindingMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java index 4fd8098..64f993f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java @@ -36,4 +36,12 @@ public class ReportController { // return new ResponseEntity<>(TableDataInfo.build(reportService.mudTransfer(json,page)), HttpStatus.OK); return null; } + + @PostMapping("/inventoryAlert") + @Log("库存物料提示记录表") + @ApiOperation("库存物料提示记录表") + public ResponseEntity inventoryAlert(JSONObject json, PageQuery page){ +// return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryAlert(json,page)), HttpStatus.OK); + return null; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index e86f792..b11ed3c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -210,7 +210,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl= Integer.parseInt(TaskStatus.FINISHED.getCode())) { throw new BadRequestException("任务已完成或已取消!"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 4d34732..d76e795 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -124,7 +124,7 @@ public class HNMLTask extends AbstractTask { task.setRemark(""); task.setVehicle_type(GeneralDefinition.MATERIAL_CUP); // 告知acs去左边右边 - String deviceCode = point.getDevice_code(); + String deviceCode = point.getParent_point_code(); int number = Integer.parseInt(deviceCode.replaceAll("[^0-9]", "")); // 1左边2右边 number = (number % 2) == 0 ? 2 : (number % 2); @@ -136,7 +136,7 @@ public class HNMLTask extends AbstractTask { pointService.updateById(point); //下发 - this.renotifyAcs(task); +// this.renotifyAcs(task); } } @@ -152,15 +152,13 @@ public class HNMLTask extends AbstractTask { // *: 混碾无工单 String materialCode = requestParam.getString("material_code"); // 混碾编码 Assert.notNull(materialCode, "物料编码不能为空!"); - MdBaseMaterial baseMaterialObj = materialService.findByCode(materialCode); - Assert.notNull(baseMaterialObj, "物料: " + materialCode + "未找到!"); // 根据工单物料标识寻找点位 - List points = hnMapper.findPointForHNMLAndWorkOrder(nextRegionStr, baseMaterialObj.getMaterial_id()); + List points = hnMapper.findPointForHNMLAndWorkOrder(nextRegionStr, materialCode); return ObjectUtil.isNotEmpty(points) ? points.get(0) : null; } @Override - public void forceFinish(String task_code) { + public void forceFinish(String task_code) { // 人工完成任务 SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); @@ -169,12 +167,13 @@ public class HNMLTask extends AbstractTask { } @Override - public void cancel(String task_code) { + public void cancel(String task_code) { // 人工取消任务 SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); + // todo： 通知acs取消任务 } public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { @@ -211,6 +210,10 @@ public class HNMLTask extends AbstractTask { // 找到父点位 SchBasePoint serviceOne = pointService.getOne(new LambdaQueryWrapper() .eq(SchBasePoint::getPoint_code, parentPointCode)); + // 父点位（设备）需要切换成非空状态 + PointUtils.setUpdateByType(serviceOne, taskFinishedType); + serviceOne.setPoint_status(PointStatusEnum.FULL_POINT.getCode()); + pointService.updateById(serviceOne); // 找压机工单 PdmBdWorkorder one = workorderService.getOne(new LambdaQueryWrapper() .eq(serviceOne != null, PdmBdWorkorder::getPoint_code, serviceOne.getPoint_code()) @@ -270,7 +273,7 @@ public class HNMLTask extends AbstractTask { String vehicleType = param.getString("vehicle_type"); // 泥料物料对应不出物料标识 String materialCode = param.getString("material_code"); // 泥料编码 - String mixTimes = param.getString("bag_number"); // 碾次 + String mixTimes = param.getString("mix_times"); // 碾次 // 载具类型默认料盅 if (vehicleType == null) { vehicleType = GeneralDefinition.MATERIAL_CUP; @@ -292,6 +295,7 @@ public class HNMLTask extends AbstractTask { // 要把数据存到组盘表 SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup(); groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + groupEntity.setMaterial_id("-"); groupEntity.setRedundance_material_code(materialCode); groupEntity.setCreate_id(GeneralDefinition.ACS_ID); groupEntity.setCreate_name(GeneralDefinition.ACS_NAME); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java index 149d8b3..d0e4f78 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java @@ -13,5 +13,5 @@ import java.util.List; */ public interface HNMapper extends BaseMapper { List findPointForHNML(List regionCode, String materialId); - List findPointForHNMLAndWorkOrder(List regionCode, String materialId); + List findPointForHNMLAndWorkOrder(List regionCode, String materialCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml index 3376f3e..374e787 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml @@ -33,7 +33,7 @@ AND p.parent_point_code LIKE CONCAT('%', (SELECT p2.point_code FROM sch_base_point p2 WHERE p2.point_code IN ( - SELECT w.point_code FROM pdm_bd_workorder w WHERE w.material_id = #{materialId} AND w.workorder_status = '3' + SELECT w.point_code FROM pdm_bd_workorder w WHERE w.raw_material_code = #{materialCode} AND w.workorder_status = '3' ) AND p2.point_status = '1' ORDER BY p2.update_time LIMIT 1), '%') diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java index d85a7d7..c20e0c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java @@ -159,10 +159,10 @@ public class YZQKTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); PointUtils.clearPoint(startPointObj); endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode()); - endPointObj.setVehicle_type("2"); + endPointObj.setVehicle_type(GeneralDefinition.STEEL_TRAY); endPointObj.setVehicle_qty(1); PointUtils.setUpdateByType(endPointObj, taskFinishedType); - pointService.update(endPointObj); + pointService.updateById(endPointObj); } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); diff --git a/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue new file mode 100644 index 0000000..7cf04f9 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/pdmBdVehicleBinding.js b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/pdmBdVehicleBinding.js new file mode 100644 index 0000000..2bff8e8 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/pdmBdVehicleBinding.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/pdmBdVehicleBinding', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/pdmBdVehicleBinding/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/pdmBdVehicleBinding', + method: 'put', + data + }) +} + +export default { add, edit, del }