From e956f6d8366eb467fccfc06ce558ab157cdec7ef Mon Sep 17 00:00:00 2001 From: xuzh <2543137953@qq.com> Date: Thu, 11 Jun 2026 16:46:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work_order/WorkOrderController.java | 57 ++++ .../service/work_order/IWorkOrderService.java | 27 ++ .../work_order/dao/WorkOrderBomDao.java | 81 +++++ .../service/work_order/dao/WorkOrderDao.java | 104 ++++++ .../dao/mapper/WorkOrderMapper.java | 34 ++ .../work_order/dao/mapper/WorkOrderMapper.xml | 180 ++++++++++ .../service/work_order/dto/WorkOrderDto.java | 317 ++++++++++++++++++ .../work_order/impl/WorkOrderServiceImpl.java | 100 ++++++ 8 files changed, 900 insertions(+) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java new file mode 100644 index 0000000..32d854a --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java @@ -0,0 +1,57 @@ +package org.nl.wms.welding_manage.controller.work_order; + +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.welding_manage.service.work_order.IWorkOrderService; +import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; +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; + +/** + * 工单接口类 + */ +@RestController +@RequestMapping("/api/workOrder") +@Slf4j +public class WorkOrderController { + + @Autowired + private IWorkOrderService iWorkOrderService; + + @GetMapping + @Log("分页查询工单列表和详情") + public ResponseEntity query(@RequestParam Map params, PageQuery page) + { + return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.queryList(page, params)), HttpStatus.OK); + } + + @PostMapping + @Log("保存工单") + public ResponseEntity save(@Validated @RequestBody WorkOrderDto dto) + { + iWorkOrderService.insert(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改工单") + public ResponseEntity update() + { + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除工单") + public ResponseEntity delete() + { + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java new file mode 100644 index 0000000..6d78210 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java @@ -0,0 +1,27 @@ +package org.nl.wms.welding_manage.service.work_order; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; +import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; + +import java.util.Map; + +public interface IWorkOrderService extends IService { + + /** + * 分页查询工单详情 + * @param pageable + * @param params + * @return + */ + IPage queryList(PageQuery pageable, Map params); + + /** + * 新增工单 + * @param entity + */ + void insert(WorkOrderDto entity); + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java new file mode 100644 index 0000000..765db6e --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java @@ -0,0 +1,81 @@ +package org.nl.wms.welding_manage.service.work_order.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_work_order_bom") +public class WorkOrderBomDao { + + private String id; + + private String item_id; + + private Integer item_no; + + private String material_code; + + private String material_name; + + private String spec; + + private String unit; + + private String base_unit; + + private BigDecimal bom_qty; + + private String work_center; + + private String load_port; + + private String dept_code; + + private String sup_org_code; + + private BigDecimal warehouse_code; + + private String warehouse_name; + + private String stocker_code; + + private String stocker_name; + + private String work_order_code; + + private String line_pod; + + private String bom_prop1; + + private String bom_prop2; + + private String bom_prop3; + + private String attr_01; + + private String attr_02; + + private String attr_03; + + private String attr_04; + + private String attr_05; + + private String attr_06; + + private String track_no; + + private BigDecimal wms_qty; + + private BigDecimal eas5_qty; + + private BigDecimal eas4_qty; + + private BigDecimal group_pallet_qty; + + private Integer status; +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java new file mode 100644 index 0000000..cf72e3d --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java @@ -0,0 +1,104 @@ +package org.nl.wms.welding_manage.service.work_order.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_work_order") +public class WorkOrderDao { + + private String id; + + private String work_order_sn_list; + + private String org_code; + + private String order_code; + + private String order_id; + + private String biz_dept_code; + + private String order_type; + + private String remark; + + private String bom_code; + + private Integer order_qty; + + private String plan_started_on; + + private String plan_finished_on; + + private BigDecimal default_warehouse_code; + + private String default_warehouse_name; + + private String track_no; + + private String unit; + + private String biz_date; + + private String product_code; + + private String product_name; + + private String product_spec; + + private String color_code; + + private String sn_detail; + + private String process_plan; + + private String step_code; + + private String lot_number; + + private String production_status; + + private String work_area; + + private String work_area_type; + + private String finished_qty; + + private String attr_01; + + private String attr_02; + + private String attr_03; + + private String attr_04; + + private String attr_05; + + private String attr_06; + + private String ser_no; + + private String src_order_code; + + private String finished_rate; + + private String product_type; + + private String layout_code; + + private String factory; + + private String workshop; + + private int status; + + private String create_time; + + private String update_time; + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java new file mode 100644 index 0000000..50b7034 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java @@ -0,0 +1,34 @@ +package org.nl.wms.welding_manage.service.work_order.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.lettuce.core.dynamic.annotation.Param; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; +import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; + +import java.util.List; +import java.util.Map; + +public interface WorkOrderMapper extends BaseMapper { + + /** + * 分页查询工单 + * @param page + * @param params + * @return + */ + IPage queryList(Page page, @Param("params") Map params); + + /** + * 保存工单 + * @param workOrderDataDto + */ + void saveWorkOrder(WorkOrderDto.WorkOrderDataDto workOrderDataDto); + + /** + * 批量保存BOM_LIST + * @param bomList + */ + void saveAllBom(List bomList); +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml new file mode 100644 index 0000000..a76ff89 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml @@ -0,0 +1,180 @@ + + + + + + INSERT INTO md_work_order( + id, work_order_sn_list, org_code, order_code, order_id, biz_dept_code, + order_type, remark, bom_code, order_qty, plan_started_on,plan_finished_on, + default_warehouse_code, default_warehouse_name, track_no, unit, biz_date, + product_code, product_name, product_spec, color_code, sn_detail, process_plan, + step_code, lot_number, production_status, work_area, work_area_type, finished_qty, + attr_01, attr_02, attr_03, attr_04, attr_05, attr_06, src_order_code, finished_rate, + product_type,layout_code, factory, workshop, create_time + ) VALUES ( + #{id}, #{workOrderSnListString}, #{orgCode}, #{orderCode}, #{orderId}, #{bizDeptCode}, + #{orderType}, #{remark}, #{bomCode}, #{orderQty}, #{planStartedOn}, #{planFinishedOn}, + #{defaultWarehouseCode}, #{defaultWarehouseName}, #{trackNo}, #{unit}, #{bizDate}, + #{productCode}, #{productName}, #{productSpec}, #{colorCode}, #{snDetail}, #{processPlan}, + #{stepCode}, #{lotNumber}, #{productionStatus}, #{workArea}, #{workAreaType}, #{finishedQty}, + #{attr01}, #{attr02}, #{attr03}, #{attr04}, #{attr05}, #{attr06}, #{srcOrderCode}, #{finishedRate}, + #{productType}, #{layoutCode}, #{factory}, #{workshop}, #{createTime} + ) + + + + INSERT INTO md_work_order_bom( + id, item_id, item_no, material_code, material_name, spec, unit, base_unit, + bom_qty, work_center, load_port, dept_code, sup_org_code, warehouse_code, + warehouse_name, stocker_code, stocker_name, work_order_code, line_pod, + bom_prop1, bom_prop2, bom_prop3, attr_01, attr_02, attr_03, attr_04, + attr_05, attr_06, track_no, wms_qty, eas5_qty, eas4_qty + ) VALUES + + ( + #{bom.id}, #{bom.itemId}, #{bom.itemNo}, #{bom.materialCode}, #{bom.materialName}, + #{bom.spec}, #{bom.unit}, #{bom.baseUnit}, #{bom.bomQty}, #{bom.workCenter}, + #{bom.loadPort}, #{bom.deptCode}, #{bom.supOrgCode}, #{bom.warehouseCode}, + #{bom.warehouseName}, #{bom.stockerCode}, #{bom.stockerName}, #{bom.workOrderCode}, + #{bom.linePod}, #{bom.bomProp1}, #{bom.bomProp2}, #{bom.bomProp3}, #{bom.attr01}, + #{bom.attr02}, #{bom.attr03}, #{bom.attr04}, #{bom.attr05}, #{bom.attr06}, + #{bom.trackNo}, #{bom.wmsQty}, #{bom.eas5Qty}, #{bom.eas4Qty} + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java new file mode 100644 index 0000000..2f0c22a --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java @@ -0,0 +1,317 @@ +package org.nl.wms.welding_manage.service.work_order.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) //忽略未知字段 +public class WorkOrderDto implements Serializable { + + @JsonProperty("WorkOrder") + private WorkOrderDataDto workOrder; + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) + public static class WorkOrderDataDto implements Serializable { + + @JsonProperty("Id") + private String id; + + @JsonProperty("WorkOrderSnList") + private List workOrderSnList; + + private String workOrderSnListString; + + @JsonProperty("OrderStatus") + private String orderStatus; + + @JsonProperty("OrgCode") + private String orgCode; + + @JsonProperty("OrderCode") + private String orderCode; + + @JsonProperty("OrderId") + private String orderId; + + @JsonProperty("BizDeptCode") + private String bizDeptCode; + + @JsonProperty("OrderType") + private String orderType; + + @JsonProperty("Remark") + private String remark; + + @JsonProperty("CreatedBy") + private String createdBy; + + @JsonProperty("ModifiedOn") + private String modifiedOn; + + @JsonProperty("CheckedBy") + private String checkedBy; + + @JsonProperty("BomCode") + private String bomCode; + + @JsonProperty("OrderQty") + private Integer orderQty; + + @JsonProperty("PlanStartedOn") + private String planStartedOn; + + @JsonProperty("PlanFinishedOn") + private String planFinishedOn; + + @JsonProperty("DefaultWarehouseCode") + private BigDecimal defaultWarehouseCode; + + @JsonProperty("DefaultWarehouseName") + private String defaultWarehouseName; + + @JsonProperty("TrackNo") + private String trackNo; + + @JsonProperty("Unit") + private String unit; + + @JsonProperty("BizDate") + private String bizDate; + + @JsonProperty("ProductCode") + private String productCode; + + @JsonProperty("ProductName") + private String productName; + + @JsonProperty("ProductSpec") + private String productSpec; + + @JsonProperty("ColorCode") + private String colorCode; + + @JsonProperty("SnDetail") + private String snDetail; + + @JsonProperty("ProcessPlan") + private String processPlan; + + @JsonProperty("StepCode") + private String stepCode; + + @JsonProperty("LotNumber") + private String lotNumber; + + @JsonProperty("ProductionStatus") + private String productionStatus; + + @JsonProperty("WorkArea") + private String workArea; + + @JsonProperty("WorkAreaType") + private String WorkAreaType; + + @JsonProperty("TeamName") + private String teamName; + + @JsonProperty("ModifiedBy") + private String modifiedBy; + + @JsonProperty("ModifiedTime") + private String modifiedTime; + + @JsonProperty("CreatedOn") + private String createdOn; + + @JsonProperty("FinishedQty") + private String finishedQty; + + @JsonProperty("SeqNo") + private String seqNo; + + @JsonProperty("Attr01") + private String attr01; + + @JsonProperty("Attr02") + private String attr02; + + @JsonProperty("Attr03") + private String attr03; + + @JsonProperty("Attr04") + private String attr04; + + @JsonProperty("Attr05") + private String attr05; + + @JsonProperty("Attr06") + private String attr06; + + @JsonProperty("SerNo") + private String serNo; + + @JsonProperty("ActualStartedOn") + private String actualStartedOn; + + @JsonProperty("ActualFinishedOn") + private String actualFinishedOn; + + @JsonProperty("SrcOrderCode") + private String srcOrderCode; + + @JsonProperty("FinishedRate") + private String finishedRate; + + @JsonProperty("BizDeptName") + private String bizDeptName; + + @JsonProperty("ProductType") + private String productType; + + @JsonProperty("LayoutCode") + private String layoutCode; + + @JsonProperty("Factory") + private String factory; + + @JsonProperty("Workshop") + private String workshop; + + @JsonProperty("Status") + private String status; + + @JsonProperty("CreateTime") + private String createTime; + + @JsonProperty("UpdateTime") + private String updateTime; + + @JsonProperty("PortList") + private List portList; + + @JsonProperty("WorkOrderBomList") + List workOrderBomList; + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) + public static class FeedPortDto implements Serializable { + + @JsonProperty("Port") + private String port; + + } + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) + public static class WorkOrderBomDto implements Serializable { + + @JsonProperty("Id") + private String id; + + @JsonProperty("ItemId") + private String itemId; + + @JsonProperty("ItemNo") + private Integer itemNo; + + @JsonProperty("MaterialCode") + private String materialCode; + + @JsonProperty("MaterialName") + private String materialName; + + @JsonProperty("Spec") + private String spec; + + @JsonProperty("Unit") + private String unit; + + @JsonProperty("BaseUnit") + private String baseUnit; + + @JsonProperty("BomQty") + private BigDecimal bomQty; + + @JsonProperty("WorkCenter") + private String workCenter; + + @JsonProperty("LoadPort") + private String loadPort; + + @JsonProperty("DeptCode") + private String deptCode; + + @JsonProperty("SupOrgCode") + private String supOrgCode; + + @JsonProperty("WarehouseCode") + private BigDecimal warehouseCode; + + @JsonProperty("WarehouseName") + private String warehouseName; + + @JsonProperty("StockerCode") + private String stockerCode; + + @JsonProperty("StockerName") + private String stockerName; + + @JsonProperty("WorkOrderCode") + private String workOrderCode; + + @JsonProperty("LinePod") + private String linePod; + + @JsonProperty("BomProp1") + private String bomProp1; + + @JsonProperty("BomProp2") + private String bomProp2; + + @JsonProperty("BomProp3") + private String bomProp3; + + @JsonProperty("Attr01") + private String attr01; + + @JsonProperty("Attr02") + private String attr02; + + @JsonProperty("Attr03") + private String attr03; + + @JsonProperty("Attr04") + private String attr04; + + @JsonProperty("Attr05") + private String attr05; + + @JsonProperty("Attr06") + private String attr06; + + @JsonProperty("TrackNo") + private String trackNo; + + @JsonProperty("WmsQty") + private BigDecimal wmsQty; + + @JsonProperty("Eas5Qty") + private BigDecimal eas5Qty; + + @JsonProperty("Eas4Qty") + private BigDecimal eas4Qty; + + @JsonProperty("GroupPalletQty") + private BigDecimal groupPalletQty; + + @JsonProperty("Status") + private BigDecimal status; + } + } +} \ No newline at end of file diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java new file mode 100644 index 0000000..557a097 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java @@ -0,0 +1,100 @@ +package org.nl.wms.welding_manage.service.work_order.impl; + +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.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; +import org.nl.wms.welding_manage.service.work_order.dao.mapper.WorkOrderMapper; +import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; +import org.nl.wms.welding_manage.service.work_order.IWorkOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +@Slf4j +@Service +public class WorkOrderServiceImpl extends ServiceImpl implements IWorkOrderService { + + @Autowired + private WorkOrderMapper workOrderMapper; + + @Override + public IPage queryList(PageQuery page, Map params) { + IPage workOrderDataDtoIPage = workOrderMapper.queryList(new Page<>(page.getPage() + 1, page.getSize()), params); + + List records = workOrderDataDtoIPage.getRecords(); + if (records != null && !records.isEmpty()) { + for (WorkOrderDto.WorkOrderDataDto record : records) { + + //获取PortList并去重 + List workOrderBomList = record.getWorkOrderBomList(); + + if (workOrderBomList != null && !workOrderBomList.isEmpty()) { + + List portDtoList = workOrderBomList.stream() + .map(WorkOrderDto.WorkOrderDataDto.WorkOrderBomDto::getLoadPort) + .filter(Objects::nonNull) + .filter(s -> !s.trim().isEmpty()) + .distinct() // 直接去重 + .map(port -> { + WorkOrderDto.WorkOrderDataDto.FeedPortDto dto = new WorkOrderDto.WorkOrderDataDto.FeedPortDto(); + dto.setPort(port); + return dto; + }) + .collect(Collectors.toList()); + + record.setPortList(portDtoList); + } + + String snListString = record.getWorkOrderSnListString(); + if (StringUtils.hasText(snListString)) { + // 按逗号分割字符串，并去除空白字符，转换为List + List snList = Arrays.stream(snListString.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .collect(Collectors.toList()); + record.setWorkOrderSnList(snList); + } + } + } + + workOrderDataDtoIPage.setRecords(records); + + return workOrderDataDtoIPage; + } + + @Override + @Transactional + public void insert(WorkOrderDto dto) { + WorkOrderDto.WorkOrderDataDto workOrderDataDto = dto.getWorkOrder(); + if (workOrderDataDto == null) { + System.out.println("workOrderDataDto is NULL"); + return; + } + + WorkOrderDto.WorkOrderDataDto workOrder = dto.getWorkOrder(); + + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowStr = now.format(dateTimeFormatter).toString(); + workOrder.setCreateTime(nowStr); + + List workOrderSnList = workOrder.getWorkOrderSnList(); + if (workOrderSnList != null && !workOrderSnList.isEmpty()) { + workOrder.setWorkOrderSnListString(String.join(",", workOrderSnList)); + } + + List workOrderBomList = workOrder.getWorkOrderBomList(); + + workOrderMapper.saveWorkOrder(workOrder); + workOrderMapper.saveAllBom(workOrderBomList); + } +} \ No newline at end of file -- 2.35.1.windows.2 From a59a372451bc30942f916cfb093fe1da26c4b8c7 Mon Sep 17 00:00:00 2001 From: xuzh <2543137953@qq.com> Date: Mon, 15 Jun 2026 19:45:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:MES=E5=B7=A5=E5=8D=95=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GateWayServiceImpl.java | 2 +- .../impl/diy/FIFONoStorHandler.java | 4 +- .../ext_manage/service/WmsToAcsService.java | 2 +- .../service/impl/AcsToWmsServiceImpl.java | 4 +- .../service/impl/WmsToAcsServiceImpl.java | 2 +- .../service/impl/PdaIosInServiceImpl.java | 4 +- .../service/impl/PdaIosOutServiceImpl.java | 9 +- .../service/impl/PdaSchTaskServiceImpl.java | 6 +- .../service/{util => core}/AbstractTask.java | 2 +- .../service/{util => core}/AcsTaskDto.java | 2 +- .../service/{util => core}/AutoTask.java | 2 +- .../{util => core}/ForewarningTask.java | 2 +- .../service/{util => core}/PointUtils.java | 2 +- .../service/{util => core}/TaskFactory.java | 2 +- .../service/{util => core}/TaskType.java | 2 +- .../{util => core}/tasks/BackInTask.java | 8 +- .../{util => core}/tasks/MoveTask.java | 8 +- .../{util => core}/tasks/PdaPointTask.java | 8 +- .../{util => core}/tasks/StInTask.java | 8 +- .../{util => core}/tasks/StOutTask.java | 8 +- .../{util => core}/tasks/VehicleInTask.java | 8 +- .../{util => core}/tasks/VehicleOutTask.java | 8 +- .../service/impl/SchBasePointServiceImpl.java | 2 +- .../service/impl/SchBaseTaskServiceImpl.java | 9 +- .../service/impl/InBillServiceImpl.java | 2 +- .../service/impl/OutBillServiceImpl.java | 2 +- .../dao/mapper/MdPbGroupplateMapper.java | 14 ++- .../dao/mapper/MdPbGroupplateMapper.xml | 30 ++++++ .../service/impl/StIvtMoveinvServiceImpl.java | 2 +- .../impl/StIvtMoveinvdtlServiceImpl.java | 2 +- .../InteractionController.java | 34 +++++++ .../product_group/ProductGroupController.java | 36 ++++++++ .../SecureInteractionController.java | 37 ++++++++ .../work_order/WorkOrderController.java | 2 + .../enums/secure_interaction/TypeEnum.java | 26 ++++++ .../enums/work_order/StatusEnum.java | 19 ++++ .../IInteractionService.java | 17 ++++ .../device_interaction/dto/BlankDto.java | 46 ++++++++++ .../device_interaction/dto/FeedDto.java | 36 ++++++++ .../impl/InteractionServiceImpl.java | 92 +++++++++++++++++++ .../product_group/IProductGroupService.java | 11 +++ .../product_group/dto/GroupPalletDto.java | 35 +++++++ .../impl/ProductGroupServiceImpl.java | 83 +++++++++++++++++ .../ISecureInteractionService.java | 10 ++ .../dto/SecureInteractionDto.java | 14 +++ .../impl/SecureInteractionServiceImpl.java | 21 +++++ .../service/work_order/IWorkOrderService.java | 10 ++ .../work_order/dao/WorkOrderBomDao.java | 2 + .../service/work_order/dao/WorkOrderDao.java | 2 + .../dao/mapper/WorkOrderMapper.java | 11 +++ .../work_order/dao/mapper/WorkOrderMapper.xml | 11 +++ .../service/work_order/dto/WorkOrderDto.java | 6 ++ .../work_order/impl/WorkOrderServiceImpl.java | 12 +++ 53 files changed, 672 insertions(+), 67 deletions(-) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/AbstractTask.java (99%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/AcsTaskDto.java (97%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/AutoTask.java (97%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/ForewarningTask.java (99%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/PointUtils.java (93%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/TaskFactory.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/TaskType.java (89%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/BackInTask.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/MoveTask.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/PdaPointTask.java (97%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/StInTask.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/StOutTask.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/VehicleInTask.java (96%) rename nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/{util => core}/tasks/VehicleOutTask.java (96%) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/device_interaction/InteractionController.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/product_group/ProductGroupController.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/secure_interaction/SecureInteractionController.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/secure_interaction/TypeEnum.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/work_order/StatusEnum.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/IInteractionService.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/BlankDto.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/FeedDto.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/impl/InteractionServiceImpl.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/IProductGroupService.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/dto/GroupPalletDto.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/ISecureInteractionService.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/dto/SecureInteractionDto.java create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/impl/SecureInteractionServiceImpl.java diff --git a/nladmin-system/wms-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java index 6e0e263..afe3b66 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.exception.BadRequestException; import org.nl.gateway.dto.InteracteDto; -import org.nl.wms.sch_manage.service.util.AbstractTask; +import org.nl.wms.sch_manage.service.core.AbstractTask; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFONoStorHandler.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFONoStorHandler.java index 9d3628e..fb6a43a 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFONoStorHandler.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFONoStorHandler.java @@ -23,14 +23,14 @@ import java.util.List; * @Date 2024/4/6 16:18 * 先进先出策略 */ -@Service("fIfONoStor") +//@Service("fIfONoStor") @Slf4j public class FIFONoStorHandler extends Decisioner { /** * 出入库明细服务 */ - @Autowired +// @Autowired private IStructattrService iStructattrService; @Override diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java index 9443acb..0ae42f7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java @@ -2,7 +2,7 @@ package org.nl.wms.ext_manage.service; import org.nl.wms.ext_manage.service.util.AcsResponse; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; import java.util.List; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java index 5eac0b0..0477799 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java @@ -10,8 +10,8 @@ import org.nl.wms.ext_manage.service.AcsToWmsService; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.TaskFactory; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.TaskFactory; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java index 379f4d3..85220e7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java @@ -5,7 +5,7 @@ import org.nl.wms.ext_manage.enums.EXTConstant; import org.nl.wms.ext_manage.service.WmsToAcsService; import org.nl.wms.ext_manage.service.util.AcsResponse; import org.nl.wms.ext_manage.util.AcsUtil; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; import org.springframework.stereotype.Service; import java.util.List; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 11ff2e4..e6a0475 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -30,8 +30,8 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseRegionService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseRegion; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.tasks.BackInTask; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.tasks.BackInTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index d6098a3..e9ef7c4 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -34,13 +34,11 @@ import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.tasks.PdaPointTask; -import org.nl.wms.sch_manage.service.util.tasks.StOutTask; -import org.nl.wms.sch_manage.service.util.tasks.VehicleOutTask; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.tasks.PdaPointTask; +import org.nl.wms.sch_manage.service.core.tasks.VehicleOutTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.inAndOut.service.IInBillService; import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; @@ -51,7 +49,6 @@ import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDisMappe import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDtlMapper; import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvMapper; import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; -import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils; import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService; import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn; import org.nl.wms.warehouse_manage.stockReturn.service.enums.StockReturnStatusEnum; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java index 9703974..8bdffd8 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java @@ -17,9 +17,9 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.dao.mapper.SchBaseTaskMapper; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.TaskFactory; -import org.nl.wms.sch_manage.service.util.tasks.PdaPointTask; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.TaskFactory; +import org.nl.wms.sch_manage.service.core.tasks.PdaPointTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.springframework.beans.factory.annotation.Autowired; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AbstractTask.java similarity index 99% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AbstractTask.java index 739578c..060ef11 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AbstractTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AcsTaskDto.java similarity index 97% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AcsTaskDto.java index 652b419..668409d 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AcsTaskDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import lombok.Data; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AutoTask.java similarity index 97% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AutoTask.java index 0354f30..ca5bdee 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/AutoTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import cn.hutool.core.util.ObjectUtil; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/ForewarningTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ForewarningTask.java similarity index 99% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/ForewarningTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ForewarningTask.java index 3b415cc..36580cc 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/ForewarningTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ForewarningTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import cn.hutool.core.collection.CollectionUtil; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/PointUtils.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/PointUtils.java similarity index 93% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/PointUtils.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/PointUtils.java index 7c4e144..8b10a19 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/PointUtils.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/PointUtils.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import com.alibaba.fastjson.JSONObject; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskFactory.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskFactory.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskFactory.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskFactory.java index 97b493b..ec22686 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskFactory.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskFactory.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskType.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskType.java similarity index 89% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskType.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskType.java index 6170020..bc44711 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/TaskType.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/TaskType.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util; +package org.nl.wms.sch_manage.service.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/BackInTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/BackInTask.java index f10836d..546b165 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/BackInTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -15,9 +15,9 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/MoveTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/MoveTask.java index 6938262..4a4bf89 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/MoveTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,9 +11,9 @@ import org.nl.common.utils.SecurityUtils; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.service.IStIvtMoveinvService; import org.nl.wms.warehouse_manage.service.IStIvtMoveinvdtlService; import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/PdaPointTask.java similarity index 97% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/PdaPointTask.java index 439da9b..ae4d7aa 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/PdaPointTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -15,9 +15,9 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StInTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StInTask.java index d0c79d2..215a872 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StInTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,9 +11,9 @@ import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.IInBillService; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StOutTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StOutTask.java index 8d8d5b4..39cdf7f 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/StOutTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,9 +11,9 @@ import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleInTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleInTask.java index fe3d4a5..551d1d8 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleInTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -15,9 +15,9 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleOutTask.java similarity index 96% rename from nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java rename to nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleOutTask.java index 2e56809..1ef8671 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/VehicleOutTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch_manage.service.util.tasks; +package org.nl.wms.sch_manage.service.core.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,9 +11,9 @@ import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.AcsTaskDto; -import org.nl.wms.sch_manage.service.util.TaskType; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.AcsTaskDto; +import org.nl.wms.sch_manage.service.core.TaskType; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index 1fe4c1c..15d8a1c 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -26,7 +26,7 @@ import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper; import org.nl.wms.sch_manage.service.dao.mapper.SchBaseRegionMapper; import org.nl.wms.sch_manage.service.dao.mapper.SchBaseTaskMapper; import org.nl.wms.sch_manage.service.dto.SchBasePointQuery; -import org.nl.wms.sch_manage.service.util.PointUtils; +import org.nl.wms.sch_manage.service.core.PointUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java index 07846ea..a1832ab 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java @@ -12,29 +12,24 @@ 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.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.basedata_manage.enums.BaseDataEnum; -import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; -import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.dao.mapper.SchBaseTaskMapper; import org.nl.wms.sch_manage.service.dto.SchBaseTaskQuery; -import org.nl.wms.sch_manage.service.util.AbstractTask; -import org.nl.wms.sch_manage.service.util.TaskFactory; +import org.nl.wms.sch_manage.service.core.AbstractTask; +import org.nl.wms.sch_manage.service.core.TaskFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author Liuxy diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index 7e0b24a..f85403e 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -29,7 +29,7 @@ import org.nl.wms.basedata_manage.service.dto.StrategyMater; import org.nl.wms.basedata_manage.service.dto.StrategyStructParam; import org.nl.wms.basedata_manage.service.dto.StructattrChangeDto; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.tasks.StInTask; +import org.nl.wms.sch_manage.service.core.tasks.StInTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 88b6f79..51d45fb 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -37,7 +37,7 @@ import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper; -import org.nl.wms.sch_manage.service.util.tasks.StOutTask; +import org.nl.wms.sch_manage.service.core.tasks.StOutTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inventory.IStInventoryService; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java index d361ad1..8242b57 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -36,9 +37,18 @@ public interface MdPbGroupplateMapper extends BaseMapper { */ IPage queryAllByPage(Page page, @Param("param") Map whereJson); - - //查询载具物料信息 List getVehicleMaterial(@Param("params") Map whereJson); + //根据托盘码和物料ID获取对应数据 + List qryDelByPalletCode(String palletCode, String materialId); + + /** + * 修改组盘数量 + * @param group_id + * @param qty + */ + void updateGroupPalletById(String group_id, BigDecimal qty); + + void insertAllData(List data); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml index 35c05da..a520706 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml @@ -85,4 +85,34 @@ ORDER BY gro.create_time Desc + + + + + UPDATE md_pb_groupplate SET qty = qty + #{qty} WHERE group_id = #{group_id} + + + + INSERT INTO md_pb_groupplate( + group_id,storagevehicle_code,material_id,pcsn,qty,qty_unit_id,qty_unit_name,ext_code,load_port,create_id,create_name,create_time + ) values + + ( + #{item.group_id}, + #{item.storagevehicle_code}, + #{item.material_id}, + #{item.pcsn}, + #{item.qty}, + #{item.qty_unit_id}, + #{item.qty_unit_name}, + #{item.ext_code}, + #{item.load_port}, + #{item.create_id}, + #{item.create_name}, + #{item.create_time} + ) + + diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java index aa53906..16c93ab 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; -import org.nl.wms.sch_manage.service.util.tasks.MoveTask; +import org.nl.wms.sch_manage.service.core.tasks.MoveTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java index 75a1102..6c34054 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java @@ -13,7 +13,7 @@ import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.service.ISchBaseTaskService; -import org.nl.wms.sch_manage.service.util.tasks.MoveTask; +import org.nl.wms.sch_manage.service.core.tasks.MoveTask; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/device_interaction/InteractionController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/device_interaction/InteractionController.java new file mode 100644 index 0000000..37f18e6 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/device_interaction/InteractionController.java @@ -0,0 +1,34 @@ +package org.nl.wms.welding_manage.controller.device_interaction; + +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @desc 焊接区设备上下料 + */ +@RestController +@RequestMapping("/api") +@Slf4j +public class InteractionController { + + @PostMapping("/feed") + @Log("产线缺料请求") + public ResponseEntity feed() + { + + return null; + } + + @PostMapping("/blank") + @Log("产线下料半成品入库请求") + public ResponseEntity blank() + { + + return null; + } + +} \ No newline at end of file diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/product_group/ProductGroupController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/product_group/ProductGroupController.java new file mode 100644 index 0000000..5c89981 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/product_group/ProductGroupController.java @@ -0,0 +1,36 @@ +package org.nl.wms.welding_manage.controller.product_group; + +import cn.dev33.satoken.annotation.SaIgnore; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.welding_manage.service.product_group.IProductGroupService; +import org.nl.wms.welding_manage.service.product_group.dto.GroupPalletDto; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @desc 产品配盘接口 + */ +@RestController +@RequestMapping("/api/productGroup") +@Slf4j +@SaIgnore +public class ProductGroupController { + + @Autowired + private IProductGroupService productGroupService; + + @PostMapping + @Log("人工组盘") + public ResponseEntity groupPallet(@Validated @RequestBody GroupPalletDto dto) { + productGroupService.groupPallet(dto); + return new ResponseEntity<>(HttpStatus.OK); + } + +} \ No newline at end of file diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/secure_interaction/SecureInteractionController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/secure_interaction/SecureInteractionController.java new file mode 100644 index 0000000..3875e3e --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/secure_interaction/SecureInteractionController.java @@ -0,0 +1,37 @@ +package org.nl.wms.welding_manage.controller.secure_interaction; + +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.welding_manage.service.secure_interaction.ISecureInteractionService; +import org.nl.wms.welding_manage.service.secure_interaction.dto.SecureInteractionDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @desc 安全交互功能 + */ +@RestController +@RequestMapping("/api/secureInteraction") +@Slf4j +public class SecureInteractionController { + + @Autowired + private ISecureInteractionService iSecureInteractionService; + + public ResponseEntity pickUpRequest(@Validated @RequestBody SecureInteractionDto dto) + { + boolean status = iSecureInteractionService.secureInteraction(dto); + if (!status) { + //失败返回 + return new ResponseEntity<>(null); + } + +// iSecureInteractionService. + + return new ResponseEntity<>(null); + } + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java index 32d854a..120aed0 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java @@ -1,5 +1,6 @@ package org.nl.wms.welding_manage.controller.work_order; +import cn.dev33.satoken.annotation.SaIgnore; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -20,6 +21,7 @@ import java.util.Map; @RestController @RequestMapping("/api/workOrder") @Slf4j +@SaIgnore public class WorkOrderController { @Autowired diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/secure_interaction/TypeEnum.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/secure_interaction/TypeEnum.java new file mode 100644 index 0000000..eefdee3 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/secure_interaction/TypeEnum.java @@ -0,0 +1,26 @@ +package org.nl.wms.welding_manage.enums.secure_interaction; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum TypeEnum { + + PICK_REQUEST(1, "取请求"), + PICK_FINISH(3, "取完成"), + RELEASE_REQUEST(2, "放请求"), + RELEASE_FINISH(4, "放完成"); + + private final Integer code; + private final String description; + + public static TypeEnum find(Integer code) { + for (TypeEnum value : TypeEnum.values()) { + if (code.equals(value.getCode())) { + return value; + } + } + return null; + } +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/work_order/StatusEnum.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/work_order/StatusEnum.java new file mode 100644 index 0000000..dd65e4b --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/enums/work_order/StatusEnum.java @@ -0,0 +1,19 @@ +package org.nl.wms.welding_manage.enums.work_order; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum StatusEnum { + + WORK_ORDER_WAIT(1, "待执行"), + WORK_ORDER_EXEC(2, "执行中"), + WORK_ORDER_FINISH(3, "完成"), + WORK_ORDER_PAUSE(4, "暂停"), + WORK_ORDER_REVOKE(5, "撤销"), + ; + + private final Integer code; + private final String description; +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/IInteractionService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/IInteractionService.java new file mode 100644 index 0000000..869ad0a --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/IInteractionService.java @@ -0,0 +1,17 @@ +package org.nl.wms.welding_manage.service.device_interaction; + +import org.nl.wms.welding_manage.service.device_interaction.dto.BlankDto; +import org.nl.wms.welding_manage.service.device_interaction.dto.FeedDto; + +public interface IInteractionService { + + /** + * 处理产线叫料请求 + * @param dto + * @return + */ + boolean feed(FeedDto dto); + + boolean blank(BlankDto dto); + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/BlankDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/BlankDto.java new file mode 100644 index 0000000..c8b0b9c --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/BlankDto.java @@ -0,0 +1,46 @@ +package org.nl.wms.welding_manage.service.device_interaction.dto; + +import lombok.Data; + +/** + * @desc 产线下料请求入参 + */ +@Data +public class BlankDto { + + /** + * @desc 产线编码 + */ + private String LineCode; + + /** + * @desc 下料位置 + */ + private String UnloadPort; + + /** + * @desc 工单编码 + */ + private String OrderCode; + + /** + * @desc 下料数量 + */ + private String UnloadQty; + + /** + * @desc 物料编码 + */ + private String MaterialCode; + + /** + * @desc 物料名称 + */ + private String MaterialName; + + /** + * @desc 创建时间 + */ + private String CreatedOn; + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/FeedDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/FeedDto.java new file mode 100644 index 0000000..9259b33 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/dto/FeedDto.java @@ -0,0 +1,36 @@ +package org.nl.wms.welding_manage.service.device_interaction.dto; + +import lombok.Data; + +/** + * @desc 产线缺料请求入参 + */ +@Data +public class FeedDto { + + /** + * @desc 产线编码 + */ + private String LineCode; + + /** + * @desc 用料位置 + */ + private String PortCode; + + /** + * @desc 工单编码 + */ + private String OrderCode; + + /** + * @desc 请求码, -- 返空+送满 1 送满 2 返空 3 托盘余料退回 4 + */ + private String RequestedCode; + + /** + * @desc 请求时间, --yyyy-MM-dd HH:mm:ss.fff + */ + private String RequestedOn; + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/impl/InteractionServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/impl/InteractionServiceImpl.java new file mode 100644 index 0000000..6cb7160 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/device_interaction/impl/InteractionServiceImpl.java @@ -0,0 +1,92 @@ +package org.nl.wms.welding_manage.service.device_interaction.impl; + +import org.nl.wms.welding_manage.service.device_interaction.IInteractionService; +import org.nl.wms.welding_manage.service.device_interaction.dto.BlankDto; +import org.nl.wms.welding_manage.service.device_interaction.dto.FeedDto; + +public class InteractionServiceImpl implements IInteractionService { + + + @Override + public boolean feed(FeedDto dto) { + + if (dto.getLineCode().isEmpty() || dto.getPortCode().isEmpty() || dto.getOrderCode().isEmpty() || dto.getRequestedCode().isEmpty()) { + //添加异常返回并推送至PDA + return false; + } + + //2.判断请求码：返空+送满 1 送满 2 返空 3 托盘余料退回 4 + switch (dto.getRequestedCode()) + { + case "1": + //返空+送满 + this.returnEmptyLoadFull(dto); + break; + case "2": + //送满 + this.LoadFull(dto); + break; + case "3": + //返空 + this.returnEmpty(dto); + break; + case "4": + //余料退回 + this.returnWarehouse(dto); + break; + default: + //添加异常信息返回对象返回异常 + return false; + } + + //3.请求处理未完成（缺料，反空未执行结束）计入redis中通过定时任务消费 + + return false; + } + + @Override + public boolean blank(BlankDto dto) { + return false; + } + + /** + * @desc 返空上满处理逻辑 + */ + public void returnEmptyLoadFull(FeedDto dto) { + + //数据需要存入返空放满队列 + } + + /** + * @desc 上满处理逻辑 + */ + public void LoadFull(FeedDto dto) { + //根据叫料位置和工单确认叫料信息 + + //判断是否有库存 + + //有库存直接创建AGV任务 && 下发任务给到NDC + } + + /** + * @desc 返空处理逻辑 + */ + public void returnEmpty(FeedDto dto) { + //根据库位获取对应返空区域 + + //判断区域内能否放空盘 + + //能放空盘入库 + + //不能放空盘计入redis，并将信息推送至PDA + } + + /** + * @desc 余料退库处理逻辑 + */ + public void returnWarehouse(FeedDto dto) { + //根据产线编码+用料位置确认请求位置 + + //创建AGV任务 && 下发AGV任务至NDC + } +} \ No newline at end of file diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/IProductGroupService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/IProductGroupService.java new file mode 100644 index 0000000..a57bf58 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/IProductGroupService.java @@ -0,0 +1,11 @@ +package org.nl.wms.welding_manage.service.product_group; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.warehouse_manage.service.dao.GroupPlate; +import org.nl.wms.welding_manage.service.product_group.dto.GroupPalletDto; + +public interface IProductGroupService { + + void groupPallet(GroupPalletDto dto); + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/dto/GroupPalletDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/dto/GroupPalletDto.java new file mode 100644 index 0000000..be5a43e --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/dto/GroupPalletDto.java @@ -0,0 +1,35 @@ +package org.nl.wms.welding_manage.service.product_group.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) //忽略未知字段 +public class GroupPalletDto { + + private String workOrder; + + private String palletCode; + + private String loadPort; + + private List bomDataList; + + @Data + @JsonIgnoreProperties(ignoreUnknown = true) //忽略未知字段 + public static class BomData { + + private String id; + + private String materialCode; + + private String unit; + + private BigDecimal useBomQty; + + } + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java new file mode 100644 index 0000000..744019f --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java @@ -0,0 +1,83 @@ +package org.nl.wms.welding_manage.service.product_group.impl; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.IdUtil; +import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; +import org.nl.wms.welding_manage.enums.work_order.StatusEnum; +import org.nl.wms.welding_manage.service.product_group.IProductGroupService; +import org.nl.wms.welding_manage.service.product_group.dto.GroupPalletDto; +import org.nl.wms.welding_manage.service.work_order.IWorkOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + + +@Slf4j +@Service +public class ProductGroupServiceImpl implements IProductGroupService { + + @Autowired + private IWorkOrderService workOrderService; + + @Autowired + private MdPbGroupplateMapper GroupPlateMapper; + + @Override + @Transactional + public void groupPallet(GroupPalletDto dto) { + + //修改工单状态todo 防呆校验 + workOrderService.updateWorkOrderStatus(dto.getWorkOrder(), StatusEnum.WORK_ORDER_EXEC.getCode()); + + //循环修改对应BomList表中已使用数量 + for (GroupPalletDto.BomData bomData : dto.getBomDataList()) { + workOrderService.updateBomUseQty(bomData.getId(), bomData.getUseBomQty()); + } + + //构建组盘数据 + List groupPalletList = new ArrayList<>(); + //查询当前数据是否存在 + for (GroupPalletDto.BomData bomData : dto.getBomDataList()) { + //如果存在执行更新 + List jsonObjects = GroupPlateMapper.qryDelByPalletCode(dto.getPalletCode(), bomData.getMaterialCode()); + if (jsonObjects != null && !jsonObjects.isEmpty()) { + //修改组盘数据 + GroupPlateMapper.updateGroupPalletById(jsonObjects.get(0).getString("group_id"), bomData.getUseBomQty()); + continue; + } + + JSONObject json = new JSONObject(); + json.put("group_id", IdUtil.getStringId()); + json.put("ext_code", dto.getWorkOrder()); + json.put("load_port", dto.getLoadPort()); + json.put("storagevehicle_code", dto.getPalletCode()); + json.put("material_id", bomData.getMaterialCode()); + json.put("pcsn", ""); + json.put("qty_unit_id", bomData.getUnit()); + json.put("qty_unit_name", bomData.getUnit()); + json.put("qty", bomData.getUseBomQty()); + json.put("create_id", "1"); + json.put("create_name", "admin"); +// json.put("create_id", SecurityUtils.getCurrentUserId()); +// json.put("create_name", SecurityUtils.getCurrentUsername()); + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String formatted = now.format(formatter); + json.put("create_time", formatted); + + //不存在插入数据批量插入 + groupPalletList.add(json); + } + + if (!groupPalletList.isEmpty()) { + //执行批量新增 + GroupPlateMapper.insertAllData(groupPalletList); + } + } +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/ISecureInteractionService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/ISecureInteractionService.java new file mode 100644 index 0000000..5d1c4e2 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/ISecureInteractionService.java @@ -0,0 +1,10 @@ +package org.nl.wms.welding_manage.service.secure_interaction; + + +import org.nl.wms.welding_manage.service.secure_interaction.dto.SecureInteractionDto; + +public interface ISecureInteractionService { + + boolean secureInteraction(SecureInteractionDto dto); + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/dto/SecureInteractionDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/dto/SecureInteractionDto.java new file mode 100644 index 0000000..1272688 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/dto/SecureInteractionDto.java @@ -0,0 +1,14 @@ +package org.nl.wms.welding_manage.service.secure_interaction.dto; + +import lombok.Data; + +@Data +public class SecureInteractionDto { + + private String point; + + private String type; + + private String containerCode; + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/impl/SecureInteractionServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/impl/SecureInteractionServiceImpl.java new file mode 100644 index 0000000..f1eecbd --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/secure_interaction/impl/SecureInteractionServiceImpl.java @@ -0,0 +1,21 @@ +package org.nl.wms.welding_manage.service.secure_interaction.impl; + +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.welding_manage.service.secure_interaction.ISecureInteractionService; +import org.nl.wms.welding_manage.service.secure_interaction.dto.SecureInteractionDto; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class SecureInteractionServiceImpl implements ISecureInteractionService { + + + @Override + public boolean secureInteraction(SecureInteractionDto dto) { +// if (dto.getType()) { +// +// } + return false; + } + +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java index 6d78210..a337cba 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java @@ -6,6 +6,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; +import java.math.BigDecimal; import java.util.Map; public interface IWorkOrderService extends IService { @@ -24,4 +25,13 @@ public interface IWorkOrderService extends IService { */ void insert(WorkOrderDto entity); + /** + * 修改工单状态 + */ + Boolean updateWorkOrderStatus(String orderCode, int status); + + /** + * 修改工单已使用bom数量 + */ + void updateBomUseQty(String id, BigDecimal qty); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java index 765db6e..881d625 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java @@ -29,6 +29,8 @@ public class WorkOrderBomDao { private BigDecimal bom_qty; + private BigDecimal use_bom_qty; + private String work_center; private String load_port; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java index cf72e3d..4068633 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java @@ -31,6 +31,8 @@ public class WorkOrderDao { private Integer order_qty; + private Integer use_order_qty; + private String plan_started_on; private String plan_finished_on; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java index 50b7034..2cb8741 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java @@ -7,6 +7,7 @@ import io.lettuce.core.dynamic.annotation.Param; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -31,4 +32,14 @@ public interface WorkOrderMapper extends BaseMapper { * @param bomList */ void saveAllBom(List bomList); + + /** + * 修改工单状态 + */ + void updateWorkOrderStatus(String orderCode, int status); + + /** + * 修改对应bom使用数量 + */ + void updateBomUseQty(String id, BigDecimal qty); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml index a76ff89..8f7e562 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml @@ -42,6 +42,15 @@ ) + + + UPDATE md_work_order SET status = #{status} WHERE order_code = #{orderCode} + + + + UPDATE md_work_order_bom SET use_bom_qty = use_bom_qty + #{qty} WHERE id = #{id} + +