工具管理-DNC刀具写入刀具准备单接口

cuilei

2025-06-13 7894ec4aafc42f90932aca9215405ed03a54edd9

工具管理-DNC刀具写入刀具准备单接口

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java

@@ -94,6 +94,15 @@
        return Result.OK("添加成功！");
    }

    @AutoLog(value = "刀具准备单-从DNC系统写入刀具准备单及明细")
    @ApiOperation(value="刀具准备单-从DNC系统写入刀具准备单及明细", notes="刀具准备单-从DNC系统写入刀具准备单及明细")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
    @PostMapping(value = "/addPreparationOrderFromDnc")
    public Result<String> addPreparationOrderFromDnc(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
        preparationOrderService.addPreparationOrderFromDnc(preparationOrderAndDetailDto);
        return Result.OK("添加成功！");
    }

    /**
     *  编辑
     * @param preparationOrder

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -21,6 +22,7 @@
 * @Version: V1.0
 */
@Data
@Accessors(chain = true)
@TableName("tms_preparation_order_detail")
@ApiModel(value="tms_preparation_order_detail对象", description="刀具准备单明细")
public class PreparationOrderDetail implements Serializable {

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java

@@ -40,4 +40,6 @@
    List<String> convertToOutboundOrder(List<String> preparationOrderIds);

    IPage<PreparationOrder> queryPageList(Page<PreparationOrder> page, Map<String, String[]> parameterMap);

    void addPreparationOrderFromDnc(PreparationOrderAndDetailDto preparationOrderAndDetailDto);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java

@@ -220,7 +220,23 @@
        return this.baseMapper.queryPageList(page, queryWrapper);
    }

    private LoginUser getCurrentUser() {
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addPreparationOrderFromDnc(PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
        PreparationOrder preparationOrder = preparationOrderConvert.convert(preparationOrderAndDetailDto);
        preparationOrder
                .setId(null)
                .setPreparationOrderNum(businessCodeRuleService.generateBusinessCodeSeq("ToolPreparationOrder"))
                .setOrderStatus(PreparationOrderStatus.PENDING_AUDIT.getValue());
        save(preparationOrder);
        List<PreparationOrderDetail> preparationOrderDetailList = preparationOrderAndDetailDto.getPreparationOrderDetailList();
        preparationOrderDetailList.forEach(item -> {
            item.setId(null).setPreparationOrderId(preparationOrder.getId());
        });
        preparationOrderDetailService.saveBatch(preparationOrderDetailList);
    }

    private LoginUser getCurrentUser() {
        // 获取当前认证的登录用户信息
        Subject currentUser = SecurityUtils.getSubject();
        if (currentUser != null && currentUser.isAuthenticated()) {