调拔单功能优化

skyouc

2 天以前 d5f42e7da3bd943f49880c8b687836a172579f6e

调拔单功能优化

 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java

@@ -22,8 +22,8 @@
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";

        generator.table = "man_transfer_item";
        generator.tableDesc = "调拔单明细";
        generator.table = "man_transfer_order";
        generator.tableDesc = "调拔单订单关联表";
        generator.packagePath = "com.vincent.rsf.server.manager";

        generator.build();

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java

@@ -58,8 +58,8 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type, OrderType.ORDER_TRANSFER.type);
        queryWrapper.in("type", list);
//        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
//        queryWrapper.in("type", list);
        return R.ok().add(outStockService.page(pageParam, queryWrapper));
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java

New file
@@ -0,0 +1,104 @@
package com.vincent.rsf.server.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.TransferOrder;
import com.vincent.rsf.server.manager.service.TransferOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.*;

@RestController
public class TransferOrderController extends BaseController {

    @Autowired
    private TransferOrderService transferOrderService;

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @PostMapping("/transferOrder/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<TransferOrder, BaseParam> pageParam = new PageParam<>(baseParam, TransferOrder.class);
        return R.ok().add(transferOrderService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @PostMapping("/transferOrder/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(transferOrderService.list());
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @PostMapping({"/transferOrder/many/{ids}", "/transferOrders/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(transferOrderService.listByIds(Arrays.asList(ids)));
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @GetMapping("/transferOrder/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(transferOrderService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:save')")
    @OperationLog("Create 调拔单订单关联表")
    @PostMapping("/transferOrder/save")
    public R save(@RequestBody TransferOrder transferOrder) {
        if (!transferOrderService.save(transferOrder)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(transferOrder);
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:update')")
    @OperationLog("Update 调拔单订单关联表")
    @PostMapping("/transferOrder/update")
    public R update(@RequestBody TransferOrder transferOrder) {
        if (!transferOrderService.updateById(transferOrder)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(transferOrder);
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:remove')")
    @OperationLog("Delete 调拔单订单关联表")
    @PostMapping("/transferOrder/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!transferOrderService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @PostMapping("/transferOrder/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<TransferOrder> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(TransferOrder::getId, condition);
        }
        transferOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
    }

    @PreAuthorize("hasAuthority('manager:transferOrder:list')")
    @PostMapping("/transferOrder/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(transferOrderService.list(), TransferOrder.class), response);
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java

@@ -56,13 +56,13 @@
    private Integer type;

    /**
     * 来源: 1: ERP系统   2: WMS系统生成   3: EXCEL导入    4: QMS系统  
     * 来源: 1: ERP系统   2: WMS系统生成   3: EXCEL导入    4: QMS系统
     */
    @ApiModelProperty(value= "来源: 1: ERP系统   2: WMS系统生成   3: EXCEL导入    4: QMS系统  ")
    private Integer source;

    /**
     * 执行状态: 0: 未执行   1: 执行中   2: 执行完成  
     * 执行状态: 0: 未执行   1: 执行中   2: 执行完成
     */
    @ApiModelProperty(value= "执行状态: 0: 未执行   1: 执行中   2: 执行完成  ")
    private Short exceStatus;
@@ -116,13 +116,13 @@
    private String tarAreaName;

    /**
     * 状态 1: 正常  0: 冻结  
     * 状态 1: 正常  0: 冻结
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     * 是否删除 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
@@ -244,7 +244,7 @@

    public String getExceStatus$() {
        if (Cools.isEmpty(this.exceStatus)){
            return "";
            return null;
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TransferOrder.java

@@ -10,7 +10,7 @@
import java.io.Serializable;

@Data
@Accessors
@Accessors(chain = true)
@TableName("man_transfer_order")
public class TransferOrder implements Serializable {


 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java

@@ -30,6 +30,8 @@
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderType.ORDER_CHECK.desc)) {
            return OrderType.ORDER_CHECK.type;
        } else if (desc.equals(OrderType.ORDER_TRANSFER.desc)) {
            return OrderType.ORDER_TRANSFER.type;
        }
        return null;
    }
@@ -41,6 +43,8 @@
            return OrderType.ORDER_OUT.desc;
        } else if (type.equals(OrderType.ORDER_CHECK.type)) {
            return OrderType.ORDER_CHECK.desc;
        } else if (type.equals(OrderType.ORDER_TRANSFER.type)) {
            return OrderType.ORDER_TRANSFER.desc;
        }
        return null;
    }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TransferType.java

@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.enums;


/**
 * @author Ryan
 * @date 2025/7/25
@@ -21,4 +22,27 @@
        this.desc = desc;
    }


    public static String getValType(Integer type) {
        if (type.equals(TransferType.TRANSFER_TYPE_WAREHOUSE.val)) {
            return TransferType.TRANSFER_TYPE_WAREHOUSE.desc;
        } else if (type.equals(TransferType.TRANSFER_TYPE_AREAS.val)) {
            return TransferType.TRANSFER_TYPE_AREAS.desc;
        } else if (type.equals(TransferType.TRANSFER_TYPE_LOCAL.val)) {
            return TransferType.TRANSFER_TYPE_LOCAL.desc;
        }
        return null;
    }

    public static Integer getTypeVal(String desc) {
        if (desc.equals(TransferType.TRANSFER_TYPE_WAREHOUSE.desc)) {
            return TransferType.TRANSFER_TYPE_WAREHOUSE.val;
        } else if (desc.equals(TransferType.TRANSFER_TYPE_AREAS.desc)) {
            return TransferType.TRANSFER_TYPE_AREAS.val;
        } else if (desc.equals(TransferType.TRANSFER_TYPE_LOCAL.desc)) {
            return TransferType.TRANSFER_TYPE_LOCAL.val;
        }
        return null;
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TransferOrderMapper.java

New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.mapper;

import com.vincent.rsf.server.manager.entity.TransferOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface TransferOrderMapper extends BaseMapper<TransferOrder> {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TransferOrderService.java

New file
@@ -0,0 +1,8 @@
package com.vincent.rsf.server.manager.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.manager.entity.TransferOrder;

public interface TransferOrderService extends IService<TransferOrder> {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferOrderServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.service.impl;

import com.vincent.rsf.server.manager.mapper.TransferOrderMapper;
import com.vincent.rsf.server.manager.entity.TransferOrder;
import com.vincent.rsf.server.manager.service.TransferOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("transferOrderService")
public class TransferOrderServiceImpl extends ServiceImpl<TransferOrderMapper, TransferOrder> implements TransferOrderService {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java

@@ -38,6 +38,8 @@
    private OutStockService outStockService;
    @Autowired
    private OutStockItemService outStockItemService;
    @Autowired
    private TransferOrderService transferOrderService;

    /**
     * @author Ryan
@@ -231,6 +233,14 @@
        if (!this.updateById(transfer)) {
            throw new CoolException("调拔单更新失败！！");
        }

        TransferOrder transferOrder = new TransferOrder();
        transferOrder.setTransferId(transfer.getId()).setOrderId(wkOrder.getId()).setExceStatus(1);

        if (!transferOrderService.save(transferOrder)) {
            throw new CoolException("单据关联失败！！");
        }

        return transfer;
    }
}

 rsf-server/src/main/java/transferOrder.sql

New file
@@ -0,0 +1,24 @@
-- save transferOrder record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.transferOrder', '0', '/manager/transferOrder', 'transferOrder', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 调拔单订单关联表', '', '1', 'manager:transferOrder:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 调拔单订单关联表', '', '1', 'manager:transferOrder:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 调拔单订单关联表', '', '1', 'manager:transferOrder:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 调拔单订单关联表', '', '1', 'manager:transferOrder:remove', '3', '1', '1');

-- locale menu name
transferOrder: 'TransferOrder',

-- locale field
transferOrder: {
    transferId: "transferId",
    orderId: "orderId",
    exceStatus: "exceStatus",
},

-- ResourceContent
import transferOrder from './transferOrder';

case 'transferOrder':
    return transferOrder;

 rsf-server/src/main/resources/mapper/manager/TransferMapper.xml

@@ -6,6 +6,8 @@
        SELECT
            id,
            `code`,
            `po_code`,
            `po_id`,
            `type`,
            `wk_type`,
            `anfme`,
@@ -14,7 +16,11 @@
            `warehouse_id`,
            `ware_area_id`,
            `wave_id`,
            `exce_status`
            `exce_status`,
            `update_time`,
            `update_by`,
            `create_by`,
            `update_by`
        FROM
            man_asn_order
        WHERE

 rsf-server/src/main/resources/mapper/manager/TransferOrderMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vincent.rsf.server.manager.mapper.TransferOrderMapper">

</mapper>