From 78fccd33321be8ec934070f1b5b899f7b13e58cb Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 16 Jun 2026 15:58:59 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/MesApiServiceImpl.java | 1 - .../service/impl/WmsToZDWmdServiceImpl.java | 2 - .../service/impl/PdaIosOutServiceImpl.java | 1 - .../service/impl/OutBillServiceImpl.java | 3 +- .../impl/StInventoryServiceImpl.java | 1 - .../work_order/WorkOrderController.java | 11 +- .../service/work_order/IWorkOrderService.java | 4 + .../dao/mapper/WorkOrderMapper.java | 5 + .../work_order/dto/WorkOrderQuery.java | 7 + .../work_order/impl/WorkOrderServiceImpl.java | 17 +- .../views/wms/pm_manage/work_order/index.vue | 305 ++++++++++++++++++ .../wms/pm_manage/work_order/workOrder.js | 35 ++ .../src/views/wms/st/purchase/index.vue | 3 +- pda/pda/src/i18n/index.js | 3 +- 14 files changed, 382 insertions(+), 16 deletions(-) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java create mode 100644 nladmin-ui/src/views/wms/pm_manage/work_order/index.vue create mode 100644 nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java index 8c0c23f..f8f94a9 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java @@ -47,7 +47,6 @@ public class MesApiServiceImpl implements MesApiService { throw new BadRequestException("请传MES失败,未配置MES_URL地址"); } String url = param.getValue(); - // TODO: add demand order API path to EXTConstant once endpoint is confirmed try { JSONObject requestParam = new JSONObject(); requestParam.put("OrderCode",workOrder); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java index da3e2b3..8d7d018 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java @@ -28,7 +28,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService { public ResponseEntity syncDemandOrder(List demands) { log.info("syncDemandOrder生产领料需求单下发输入参数：-------------------" + demands.size()); String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue(); - // TODO: add demand order API path to EXTConstant once endpoint is confirmed try { String resultMsg = HttpRequest.post(url) .body(JSONArray.parseArray(JSON.toJSONString(demands)).toJSONString()) @@ -45,7 +44,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService { public ResponseEntity syncPurchaseReceiving(JSONObject whereJson) { log.info("syncPurchaseReceiving采购入库单下发输入参数：-------------------" + whereJson.toString()); String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue(); - // TODO: add purchase receiving API path to EXTConstant once endpoint is confirmed try { String resultMsg = HttpRequest.post(url) .body(whereJson.toString()) 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 e9ef7c4..b7dda31 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 @@ -305,7 +305,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); } - //TODO：生成手工领料单 final PmStockReturn stockReturn = new PmStockReturn(); stockReturn.setCreate_time(DateUtil.now()); stockReturn.setRequest_type(IOSEnum.BILL_TYPE.code("生产出库")); 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 51d45fb..9b7ba65 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 @@ -1133,7 +1133,6 @@ public class OutBillServiceImpl extends ServiceImpl i } @Override @Transactional - //TODO：调拨还是直接出库 public void disFinish(List disList) { // 完成当前任务对应的所有分配明细 List outFinsParams = new ArrayList<>(); @@ -1191,7 +1190,7 @@ public class OutBillServiceImpl extends ServiceImpl i } } iStInventoryService.changeInventory(InventoryChangeType.ADD_INV, addInvParams); - //生成调拨入库单据 + //TODO：生成调拨入库单据 } // 如果分配明细全部完成则更新明细表状态 if (countDis == 0){ diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java index 65fc42a..61d562d 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java @@ -68,7 +68,6 @@ public class StInventoryServiceImpl implements IStInventoryService { .material_code(invParam.getMaterialCode()) .storagevehicle_code(invParam.getStoragevehicleCode()) .pcsn(invParam.getPcsn()) - //TODO:先给默认个 .qty_unit_id(invParam.getUnitId()) .qty_unit_name(invParam.getUnitName()) .qty(invParam.getQty()) 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 120aed0..203e3d9 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 @@ -7,6 +7,7 @@ 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.nl.wms.welding_manage.service.work_order.dto.WorkOrderQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -29,9 +30,13 @@ public class WorkOrderController { @GetMapping @Log("分页查询工单列表和详情") - public ResponseEntity query(@RequestParam Map params, PageQuery page) - { - return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.queryList(page, params)), HttpStatus.OK); + public ResponseEntity query(WorkOrderQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.page(page.build(),query.build())), HttpStatus.OK); + } + @GetMapping("/getOrderItem") + @SaIgnore + public ResponseEntity getOrderItem(String orderCode) { + return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.getOrderBomItem(orderCode)), HttpStatus.OK); } @PostMapping 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 a337cba..31fd818 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 @@ -3,10 +3,12 @@ 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.WorkOrderBomDao; 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; public interface IWorkOrderService extends IService { @@ -34,4 +36,6 @@ public interface IWorkOrderService extends IService { * 修改工单已使用bom数量 */ void updateBomUseQty(String id, BigDecimal qty); + + List getOrderBomItem(String orderCode); } 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 2cb8741..5408808 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 @@ -4,6 +4,8 @@ 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.apache.ibatis.annotations.Select; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; @@ -13,6 +15,9 @@ import java.util.Map; public interface WorkOrderMapper extends BaseMapper { + @Select("SELECT * FROM md_work_order_bom WHERE work_order_code = #{orderCode} ORDER BY item_no ASC") + List getOrderBomItem(String orderCode); + /** * 分页查询工单 * @param page diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java new file mode 100644 index 0000000..2a6ba29 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java @@ -0,0 +1,7 @@ +package org.nl.wms.welding_manage.service.work_order.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; + +public class WorkOrderQuery extends BaseQuery { +} 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 index 7824cbd..2230e5d 100644 --- 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 @@ -4,7 +4,10 @@ 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.StringUtils; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; 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; @@ -12,7 +15,6 @@ 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.math.BigDecimal; import java.time.LocalDateTime; @@ -56,8 +58,7 @@ public class WorkOrderServiceImpl extends ServiceImpl snList = Arrays.stream(snListString.split(",")) .map(String::trim) .filter(s -> !s.isEmpty()) @@ -109,4 +110,12 @@ public class WorkOrderServiceImpl extends ServiceImpl getOrderBomItem(String orderCode) { + if (StringUtils.isEmpty(orderCode)){ + throw new BadRequestException("查询工单明细失败,工单编号为空"); + } + return workOrderMapper.getOrderBomItem(orderCode); + } +} diff --git a/nladmin-ui/src/views/wms/pm_manage/work_order/index.vue b/nladmin-ui/src/views/wms/pm_manage/work_order/index.vue new file mode 100644 index 0000000..a3033a7 --- /dev/null +++ b/nladmin-ui/src/views/wms/pm_manage/work_order/index.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js b/nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js new file mode 100644 index 0000000..b79c507 --- /dev/null +++ b/nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/workOrder', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/workOrder', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/workOrder', + method: 'put', + data + }) +} +export function getItem(data) { + return request({ + url: 'api/workOrder/getOrderItem', + method: 'get', + params: { + orderCode: data + } + }) +} +export default { add, edit, del, getItem } diff --git a/nladmin-ui/src/views/wms/st/purchase/index.vue b/nladmin-ui/src/views/wms/st/purchase/index.vue index 3f2bf67..7bf9b75 100644 --- a/nladmin-ui/src/views/wms/st/purchase/index.vue +++ b/nladmin-ui/src/views/wms/st/purchase/index.vue @@ -27,7 +27,8 @@ - 下发回传单 + 强制回传 + 条码打印 diff --git a/pda/pda/src/i18n/index.js b/pda/pda/src/i18n/index.js index 0d57933..5b1ab52 100644 --- a/pda/pda/src/i18n/index.js +++ b/pda/pda/src/i18n/index.js @@ -26,7 +26,8 @@ const zh = { '平库库存查询', '库位绑定/解绑', '平库调拨出库', - '线边领料出库' + '线边领料出库', + '配盘入库' // '空托上架/下架/注册/呼叫', // 'AGV配送', // '人工盘点',