Merge remote-tracking branch 'origin/dev' into dev

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/service/tmpltp/TemplateInstanceDataServiceImpl.java

@@ -9,20 +9,15 @@ import cn.iocoder.yudao.module.base.dal.mysql.tmpltp.TemplateInstanceDataMapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.base.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.tmpltp.enums.ErrorCodeConstants.TEMPLATE_INSTANCE_DATA_NOT_EXISTS;
 
 /**

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/service/tmpltp/TemplateInstanceItemServiceImpl.java

@@ -9,20 +9,10 @@ import cn.iocoder.yudao.module.base.dal.mysql.tmpltp.TemplateInstanceItemMapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-
-
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.base.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.tmpltp.enums.ErrorCodeConstants.TEMPLATE_INSTANCE_ITEM_NOT_EXISTS;
 
 /**

yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java

@@ -19,4 +19,7 @@ public interface ErrorCodeConstants {
     ErrorCode ERP_INTERNAL_ORDER_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
     ErrorCode ERP_SALES_ORGANIZATION_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
     ErrorCode ERP_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_ASSET_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_CONTRACT_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_PRODUCTIVE_ORDER_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
 }

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpAssetController.java

@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpAssetDO;
+import cn.iocoder.yudao.module.erp.service.erp.ErpAssetService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - ERP资产卡片")
+@RestController
+@RequestMapping("/sply/erp-asset")
+@Validated
+public class ErpAssetController {
+
+
+    @Resource
+    private ErpAssetService erpAssetService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建ERP资产卡片")
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:create')")
+    public CommonResult<ErpAssetRespVO> createErpAsset(@Valid @RequestBody ErpAssetSaveReqVO createReqVO) {
+        return success(erpAssetService.createErpAsset(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新ERP资产卡片")
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:update')")
+    public CommonResult<Boolean> updateErpAsset(@Valid @RequestBody ErpAssetSaveReqVO updateReqVO) {
+        erpAssetService.updateErpAsset(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除ERP资产卡片")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:delete')")
+    public CommonResult<Boolean> deleteErpAsset(@RequestParam("id") Long id) {
+        erpAssetService.deleteErpAsset(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除ERP资产卡片")
+                @PreAuthorize("@ss.hasPermission('sply:erp-asset:delete')")
+    public CommonResult<Boolean> deleteErpAssetList(@RequestBody BatchDeleteReqVO req) {
+        erpAssetService.deleteErpAssetListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得ERP资产卡片")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:query')")
+    public CommonResult<ErpAssetRespVO> getErpAsset(@RequestParam("id") Long id) {
+        ErpAssetDO erpAsset = erpAssetService.getErpAsset(id);
+        return success(BeanUtils.toBean(erpAsset, ErpAssetRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得ERP资产卡片分页")
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:query')")
+    public CommonResult<PageResult<ErpAssetRespVO>> getErpAssetPage(@Valid ErpAssetPageReqVO pageReqVO) {
+        PageResult<ErpAssetDO> pageResult = erpAssetService.getErpAssetPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ErpAssetRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出ERP资产卡片 Excel")
+    @PreAuthorize("@ss.hasPermission('sply:erp-asset:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportErpAssetExcel(@Valid ErpAssetPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ErpAssetDO> list = erpAssetService.getErpAssetPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "ERP资产卡片.xls", "数据", ErpAssetRespVO.class,
+                        BeanUtils.toBean(list, ErpAssetRespVO.class));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpContractController.java

@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpContractDO;
+import cn.iocoder.yudao.module.erp.service.erp.ErpContractService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - ERP合同映射")
+@RestController
+@RequestMapping("/bse/erp-contract")
+@Validated
+public class ErpContractController {
+
+
+    @Resource
+    private ErpContractService erpContractService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建ERP合同映射")
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:create')")
+    public CommonResult<ErpContractRespVO> createErpContract(@Valid @RequestBody ErpContractSaveReqVO createReqVO) {
+        return success(erpContractService.createErpContract(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新ERP合同映射")
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:update')")
+    public CommonResult<Boolean> updateErpContract(@Valid @RequestBody ErpContractSaveReqVO updateReqVO) {
+        erpContractService.updateErpContract(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除ERP合同映射")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:delete')")
+    public CommonResult<Boolean> deleteErpContract(@RequestParam("id") Long id) {
+        erpContractService.deleteErpContract(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除ERP合同映射")
+                @PreAuthorize("@ss.hasPermission('bse:erp-contract:delete')")
+    public CommonResult<Boolean> deleteErpContractList(@RequestBody BatchDeleteReqVO req) {
+        erpContractService.deleteErpContractListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得ERP合同映射")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:query')")
+    public CommonResult<ErpContractRespVO> getErpContract(@RequestParam("id") Long id) {
+        ErpContractDO erpContract = erpContractService.getErpContract(id);
+        return success(BeanUtils.toBean(erpContract, ErpContractRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得ERP合同映射分页")
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:query')")
+    public CommonResult<PageResult<ErpContractRespVO>> getErpContractPage(@Valid ErpContractPageReqVO pageReqVO) {
+        PageResult<ErpContractDO> pageResult = erpContractService.getErpContractPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ErpContractRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出ERP合同映射 Excel")
+    @PreAuthorize("@ss.hasPermission('bse:erp-contract:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportErpContractExcel(@Valid ErpContractPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ErpContractDO> list = erpContractService.getErpContractPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "ERP合同映射.xls", "数据", ErpContractRespVO.class,
+                        BeanUtils.toBean(list, ErpContractRespVO.class));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpInternalOrderController.java

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import jakarta.annotation.Resource;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderPageReqVO;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderRespVO;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderSaveReqVO;
-
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
 import cn.iocoder.yudao.module.erp.service.erp.ErpInternalOrderService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - ERP内部订单")
 @RestController

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpProductiveOrderController.java

@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpProductiveOrderDO;
+import cn.iocoder.yudao.module.erp.service.erp.ErpProductiveOrderService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - ERP生产订单")
+@RestController
+@RequestMapping("/sply/erp-productive-order")
+@Validated
+public class ErpProductiveOrderController {
+
+
+    @Resource
+    private ErpProductiveOrderService erpProductiveOrderService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建ERP生产订单")
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:create')")
+    public CommonResult<ErpProductiveOrderRespVO> createErpProductiveOrder(@Valid @RequestBody ErpProductiveOrderSaveReqVO createReqVO) {
+        return success(erpProductiveOrderService.createErpProductiveOrder(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新ERP生产订单")
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:update')")
+    public CommonResult<Boolean> updateErpProductiveOrder(@Valid @RequestBody ErpProductiveOrderSaveReqVO updateReqVO) {
+        erpProductiveOrderService.updateErpProductiveOrder(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除ERP生产订单")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:delete')")
+    public CommonResult<Boolean> deleteErpProductiveOrder(@RequestParam("id") Long id) {
+        erpProductiveOrderService.deleteErpProductiveOrder(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除ERP生产订单")
+                @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:delete')")
+    public CommonResult<Boolean> deleteErpProductiveOrderList(@RequestBody BatchDeleteReqVO req) {
+        erpProductiveOrderService.deleteErpProductiveOrderListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得ERP生产订单")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:query')")
+    public CommonResult<ErpProductiveOrderRespVO> getErpProductiveOrder(@RequestParam("id") Long id) {
+        ErpProductiveOrderDO erpProductiveOrder = erpProductiveOrderService.getErpProductiveOrder(id);
+        return success(BeanUtils.toBean(erpProductiveOrder, ErpProductiveOrderRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得ERP生产订单分页")
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:query')")
+    public CommonResult<PageResult<ErpProductiveOrderRespVO>> getErpProductiveOrderPage(@Valid ErpProductiveOrderPageReqVO pageReqVO) {
+        PageResult<ErpProductiveOrderDO> pageResult = erpProductiveOrderService.getErpProductiveOrderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ErpProductiveOrderRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出ERP生产订单 Excel")
+    @PreAuthorize("@ss.hasPermission('sply:erp-productive-order:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportErpProductiveOrderExcel(@Valid ErpProductiveOrderPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ErpProductiveOrderDO> list = erpProductiveOrderService.getErpProductiveOrderPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "ERP生产订单.xls", "数据", ErpProductiveOrderRespVO.class,
+                        BeanUtils.toBean(list, ErpProductiveOrderRespVO.class));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpPurchaseOrganizationController.java

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import jakarta.annotation.Resource;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationPageReqVO;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationRespVO;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationSaveReqVO;
-
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
 import cn.iocoder.yudao.module.erp.service.erp.ErpPurchaseOrganizationService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - ERP采购组织")
 @RestController

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpSalesOrganizationController.java

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import jakarta.annotation.Resource;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationPageReqVO;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationRespVO;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationSaveReqVO;
-
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import cn.iocoder.yudao.module.erp.service.erp.ErpSalesOrganizationService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - ERP销售组织")
 @RestController

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpWarehouseController.java

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import jakarta.annotation.Resource;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseRespVO;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseSaveReqVO;
-
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import cn.iocoder.yudao.module.erp.service.erp.ErpWarehouseService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - ERP库位")
 @RestController

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpAssetPageReqVO.java

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP资产卡片分页 Request VO")
+@Data
+public class ErpAssetPageReqVO extends PageParam {
+
+    @Schema(description = "公司编号")
+    private String companyNumber;
+
+    @Schema(description = "资产主编码")
+    private String mainAssetNumber;
+
+    @Schema(description = "记录创建日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] recordCreateDate;
+
+    @Schema(description = "更改用户名", example = "芋艿")
+    private String updateUserName;
+
+    @Schema(description = "资产类编号")
+    private String assetTypeNumber;
+
+    @Schema(description = "资产类描述", example = "李四")
+    private String assetTypeName;
+
+    @Schema(description = "资产资本化日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] assetDate;
+
+    @Schema(description = "基本计量单位")
+    private String uom;
+
+    @Schema(description = "数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "资产描述")
+    private String assetDescription;
+
+    @Schema(description = "附加资产描述")
+    private String assetDescriptionAttach;
+
+    @Schema(description = "折旧计算开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] depreciationStartDate;
+
+    @Schema(description = "计划年使用期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] planYearDate;
+
+    @Schema(description = "成本中心编码")
+    private String costcenterNumber;
+
+    @Schema(description = "责任成本中心")
+    private String dutyCostcenterNumber;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpAssetRespVO.java

@@ -0,0 +1,80 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP资产卡片 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpAssetRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31799")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "公司编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("公司编号")
+    private String companyNumber;
+
+    @Schema(description = "资产主编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("资产主编码")
+    private String mainAssetNumber;
+
+    @Schema(description = "记录创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("记录创建日期")
+    private LocalDateTime recordCreateDate;
+
+    @Schema(description = "更改用户名", example = "芋艿")
+    @ExcelProperty("更改用户名")
+    private String updateUserName;
+
+    @Schema(description = "资产类编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("资产类编号")
+    private String assetTypeNumber;
+
+    @Schema(description = "资产类描述", example = "李四")
+    @ExcelProperty("资产类描述")
+    private String assetTypeName;
+
+    @Schema(description = "资产资本化日期")
+    @ExcelProperty("资产资本化日期")
+    private LocalDateTime assetDate;
+
+    @Schema(description = "基本计量单位")
+    @ExcelProperty("基本计量单位")
+    private String uom;
+
+    @Schema(description = "数量")
+    @ExcelProperty("数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "资产描述")
+    @ExcelProperty("资产描述")
+    private String assetDescription;
+
+    @Schema(description = "附加资产描述")
+    @ExcelProperty("附加资产描述")
+    private String assetDescriptionAttach;
+
+    @Schema(description = "折旧计算开始日期")
+    @ExcelProperty("折旧计算开始日期")
+    private LocalDateTime depreciationStartDate;
+
+    @Schema(description = "计划年使用期")
+    @ExcelProperty("计划年使用期")
+    private LocalDateTime planYearDate;
+
+    @Schema(description = "成本中心编码")
+    @ExcelProperty("成本中心编码")
+    private String costcenterNumber;
+
+    @Schema(description = "责任成本中心")
+    @ExcelProperty("责任成本中心")
+    private String dutyCostcenterNumber;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpAssetSaveReqVO.java

@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP资产卡片新增/修改 Request VO")
+@Data
+public class ErpAssetSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31799")
+    private Long id;
+
+    @Schema(description = "公司编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "公司编号不能为空")
+    private String companyNumber;
+
+    @Schema(description = "资产主编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "资产主编码不能为空")
+    private String mainAssetNumber;
+
+    @Schema(description = "记录创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "记录创建日期不能为空")
+    private LocalDateTime recordCreateDate;
+
+    @Schema(description = "更改用户名", example = "芋艿")
+    private String updateUserName;
+
+    @Schema(description = "资产类编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "资产类编号不能为空")
+    private String assetTypeNumber;
+
+    @Schema(description = "资产类描述", example = "李四")
+    private String assetTypeName;
+
+    @Schema(description = "资产资本化日期")
+    private LocalDateTime assetDate;
+
+    @Schema(description = "基本计量单位")
+    private String uom;
+
+    @Schema(description = "数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "资产描述")
+    private String assetDescription;
+
+    @Schema(description = "附加资产描述")
+    private String assetDescriptionAttach;
+
+    @Schema(description = "折旧计算开始日期")
+    private LocalDateTime depreciationStartDate;
+
+    @Schema(description = "计划年使用期")
+    private LocalDateTime planYearDate;
+
+    @Schema(description = "成本中心编码")
+    private String costcenterNumber;
+
+    @Schema(description = "责任成本中心")
+    private String dutyCostcenterNumber;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpContractPageReqVO.java

@@ -0,0 +1,180 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP合同映射分页 Request VO")
+@Data
+public class ErpContractPageReqVO extends PageParam {
+
+    @Schema(description = "操作标识", example = "3035")
+    private String operationId;
+
+    @Schema(description = "合同主信息主键", example = "10259")
+    private Long contractMainId;
+
+    @Schema(description = "合同编号")
+    private String contractPaperNumber;
+
+    @Schema(description = "合同名称", example = "芋艿")
+    private String contractName;
+
+    @Schema(description = "合同类型编号")
+    private String contractTypeNumber;
+
+    @Schema(description = "合同类型名称", example = "李四")
+    private String contractTypeName;
+
+    @Schema(description = "合同类别")
+    private String contractCategory;
+
+    @Schema(description = "是否虚拟合同")
+    private String isVirtualContract;
+
+    @Schema(description = "客户/供应商编号;SAP客商公司代码")
+    private String supplierNumber;
+
+    @Schema(description = "客户/供应商名称;SAP客商公司名称", example = "张三")
+    private String supplierName;
+
+    @Schema(description = "代理方;SAP客商公司代码")
+    private String agent;
+
+    @Schema(description = "合同实施主体编号;SAP公司代码")
+    private String contractImplementNumber;
+
+    @Schema(description = "合同签订主体编号;SAP公司代码")
+    private String contractSignNumber;
+
+    @Schema(description = "合同签订日期;格式：YYYY-MM-DD")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] signDate;
+
+    @Schema(description = "合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] startDate;
+
+    @Schema(description = "合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] stopDate;
+
+    @Schema(description = "币种编号")
+    private String currency;
+
+    @Schema(description = "合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00")
+    private BigDecimal sourceAmount;
+
+    @Schema(description = "合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00")
+    private BigDecimal basicAmount;
+
+    @Schema(description = "变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）")
+    private BigDecimal changeSourceAmount;
+
+    @Schema(description = "变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）")
+    private BigDecimal changeBasicAmount;
+
+    @Schema(description = "合同状态编号")
+    private String statusNumber;
+
+    @Schema(description = "合同状态名称", example = "赵六")
+    private String statusName;
+
+    @Schema(description = "是否有预付款;长单合同:否，非长单:取合同的预付款")
+    private String isPrepayment;
+
+    @Schema(description = "预付款比例;有预付款则需要填写")
+    private BigDecimal prepaymentRatio;
+
+    @Schema(description = "预付款金额;有预付款则需要填写(通过计算得出)")
+    private BigDecimal prepaymentAmount;
+
+    @Schema(description = "履约保证金-变更前（原币）")
+    private BigDecimal sourceBeforeBond;
+
+    @Schema(description = "履约保证金-变更前（本位币）")
+    private BigDecimal basicBeforeBond;
+
+    @Schema(description = "履约保证金-变更后（原币）")
+    private BigDecimal sourceAfterBond;
+
+    @Schema(description = "履约保证金-变更后（本位币）")
+    private BigDecimal basicAfterBond;
+
+    @Schema(description = "是否含质保金")
+    private String isQualityassuranceAmount;
+
+    @Schema(description = "质保金比例;有质保金则需要填写")
+    private BigDecimal qualityassuranceRatio;
+
+    @Schema(description = "质保金金额;有质保金则需要填写")
+    private BigDecimal qualityassuranceAmount;
+
+    @Schema(description = "是否内部企业")
+    private String isInternal;
+
+    @Schema(description = "收支性质")
+    private String nature;
+
+    @Schema(description = "备注信息;提交ERP")
+    private String remark;
+
+    @Schema(description = "累计结算金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulateSettlementAmount;
+
+    @Schema(description = "累计结算金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulateSettlementAmount;
+
+    @Schema(description = "累计已收付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceUseAmount;
+
+    @Schema(description = "累计已收付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicUseAmount;
+
+    @Schema(description = "累计已开收票金额（原币-含税）;暂定不传")
+    private BigDecimal sourceInvoiceAmount;
+
+    @Schema(description = "累计已开收票金额（本位币-含税）;暂定不传")
+    private BigDecimal basicInvoiceAmount;
+
+    @Schema(description = "累计预付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulatePrepayment;
+
+    @Schema(description = "累计预付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulatePrepayment;
+
+    @Schema(description = "履约保证金累计付款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateBond;
+
+    @Schema(description = "履约保证金累计付款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateBond;
+
+    @Schema(description = "履约保证金累计收款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateAmount;
+
+    @Schema(description = "履约保证金累计收款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateAmount;
+
+    @Schema(description = "是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00")
+    private String isFramework;
+
+    @Schema(description = "境内/境外")
+    private String isDomestic;
+
+    @Schema(description = "建筑服务发生地;销售合同，且类型为SAP02COSR必填")
+    private String architectureService‌Place;
+
+    @Schema(description = "达到收款条件金额;销售合同，且类型为SAP02COSR必填")
+    private BigDecimal payeeConditionAmount;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] createTime;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpContractRespVO.java

@@ -0,0 +1,232 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Schema(description = "管理后台 - ERP合同映射 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpContractRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9114")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "操作标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "3035")
+    @ExcelProperty("操作标识")
+    private String operationId;
+
+    @Schema(description = "合同主信息主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10259")
+    @ExcelProperty("合同主信息主键")
+    private Long contractMainId;
+
+    @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同编号")
+    private String contractPaperNumber;
+
+    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("合同名称")
+    private String contractName;
+
+    @Schema(description = "合同类型编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同类型编号")
+    private String contractTypeNumber;
+
+    @Schema(description = "合同类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("合同类型名称")
+    private String contractTypeName;
+
+    @Schema(description = "合同类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同类别")
+    private String contractCategory;
+
+    @Schema(description = "是否虚拟合同", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否虚拟合同")
+    private String isVirtualContract;
+
+    @Schema(description = "客户/供应商编号;SAP客商公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("客户/供应商编号;SAP客商公司代码")
+    private String supplierNumber;
+
+    @Schema(description = "客户/供应商名称;SAP客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("客户/供应商名称;SAP客商公司名称")
+    private String supplierName;
+
+    @Schema(description = "代理方;SAP客商公司代码")
+    @ExcelProperty("代理方;SAP客商公司代码")
+    private String agent;
+
+    @Schema(description = "合同实施主体编号;SAP公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同实施主体编号;SAP公司代码")
+    private String contractImplementNumber;
+
+    @Schema(description = "合同签订主体编号;SAP公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同签订主体编号;SAP公司代码")
+    private String contractSignNumber;
+
+    @Schema(description = "合同签订日期;格式：YYYY-MM-DD", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同签订日期;格式：YYYY-MM-DD")
+    private LocalDate signDate;
+
+    @Schema(description = "合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期")
+    private LocalDate startDate;
+
+    @Schema(description = "合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期")
+    private LocalDate stopDate;
+
+    @Schema(description = "币种编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("币种编号")
+    private String currency;
+
+    @Schema(description = "合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00")
+    private BigDecimal sourceAmount;
+
+    @Schema(description = "合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00")
+    private BigDecimal basicAmount;
+
+    @Schema(description = "变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）")
+    private BigDecimal changeSourceAmount;
+
+    @Schema(description = "变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）")
+    private BigDecimal changeBasicAmount;
+
+    @Schema(description = "合同状态编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("合同状态编号")
+    private String statusNumber;
+
+    @Schema(description = "合同状态名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("合同状态名称")
+    private String statusName;
+
+    @Schema(description = "是否有预付款;长单合同:否，非长单:取合同的预付款", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否有预付款;长单合同:否，非长单:取合同的预付款")
+    private String isPrepayment;
+
+    @Schema(description = "预付款比例;有预付款则需要填写")
+    @ExcelProperty("预付款比例;有预付款则需要填写")
+    private BigDecimal prepaymentRatio;
+
+    @Schema(description = "预付款金额;有预付款则需要填写(通过计算得出)")
+    @ExcelProperty("预付款金额;有预付款则需要填写(通过计算得出)")
+    private BigDecimal prepaymentAmount;
+
+    @Schema(description = "履约保证金-变更前（原币）")
+    @ExcelProperty("履约保证金-变更前（原币）")
+    private BigDecimal sourceBeforeBond;
+
+    @Schema(description = "履约保证金-变更前（本位币）")
+    @ExcelProperty("履约保证金-变更前（本位币）")
+    private BigDecimal basicBeforeBond;
+
+    @Schema(description = "履约保证金-变更后（原币）")
+    @ExcelProperty("履约保证金-变更后（原币）")
+    private BigDecimal sourceAfterBond;
+
+    @Schema(description = "履约保证金-变更后（本位币）")
+    @ExcelProperty("履约保证金-变更后（本位币）")
+    private BigDecimal basicAfterBond;
+
+    @Schema(description = "是否含质保金", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否含质保金")
+    private String isQualityassuranceAmount;
+
+    @Schema(description = "质保金比例;有质保金则需要填写")
+    @ExcelProperty("质保金比例;有质保金则需要填写")
+    private BigDecimal qualityassuranceRatio;
+
+    @Schema(description = "质保金金额;有质保金则需要填写")
+    @ExcelProperty("质保金金额;有质保金则需要填写")
+    private BigDecimal qualityassuranceAmount;
+
+    @Schema(description = "是否内部企业", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否内部企业")
+    private String isInternal;
+
+    @Schema(description = "收支性质", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("收支性质")
+    private String nature;
+
+    @Schema(description = "备注信息;提交ERP")
+    @ExcelProperty("备注信息;提交ERP")
+    private String remark;
+
+    @Schema(description = "累计结算金额（原币-含税）;暂定不传")
+    @ExcelProperty("累计结算金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulateSettlementAmount;
+
+    @Schema(description = "累计结算金额（本位币-含税）;暂定不传")
+    @ExcelProperty("累计结算金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulateSettlementAmount;
+
+    @Schema(description = "累计已收付款金额（原币-含税）;暂定不传")
+    @ExcelProperty("累计已收付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceUseAmount;
+
+    @Schema(description = "累计已收付款金额（本位币-含税）;暂定不传")
+    @ExcelProperty("累计已收付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicUseAmount;
+
+    @Schema(description = "累计已开收票金额（原币-含税）;暂定不传")
+    @ExcelProperty("累计已开收票金额（原币-含税）;暂定不传")
+    private BigDecimal sourceInvoiceAmount;
+
+    @Schema(description = "累计已开收票金额（本位币-含税）;暂定不传")
+    @ExcelProperty("累计已开收票金额（本位币-含税）;暂定不传")
+    private BigDecimal basicInvoiceAmount;
+
+    @Schema(description = "累计预付款金额（原币-含税）;暂定不传")
+    @ExcelProperty("累计预付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulatePrepayment;
+
+    @Schema(description = "累计预付款金额（本位币-含税）;暂定不传")
+    @ExcelProperty("累计预付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulatePrepayment;
+
+    @Schema(description = "履约保证金累计付款金额（原币）;暂定不传")
+    @ExcelProperty("履约保证金累计付款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateBond;
+
+    @Schema(description = "履约保证金累计付款金额（本位币）;暂定不传")
+    @ExcelProperty("履约保证金累计付款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateBond;
+
+    @Schema(description = "履约保证金累计收款金额（原币）;暂定不传")
+    @ExcelProperty("履约保证金累计收款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateAmount;
+
+    @Schema(description = "履约保证金累计收款金额（本位币）;暂定不传")
+    @ExcelProperty("履约保证金累计收款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateAmount;
+
+    @Schema(description = "是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00")
+    private String isFramework;
+
+    @Schema(description = "境内/境外", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("境内/境外")
+    private String isDomestic;
+
+    @Schema(description = "建筑服务发生地;销售合同，且类型为SAP02COSR必填")
+    @ExcelProperty("建筑服务发生地;销售合同，且类型为SAP02COSR必填")
+    private String architectureService‌Place;
+
+    @Schema(description = "达到收款条件金额;销售合同，且类型为SAP02COSR必填")
+    @ExcelProperty("达到收款条件金额;销售合同，且类型为SAP02COSR必填")
+    private BigDecimal payeeConditionAmount;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDate createTime;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpContractSaveReqVO.java

@@ -0,0 +1,202 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Schema(description = "管理后台 - ERP合同映射新增/修改 Request VO")
+@Data
+public class ErpContractSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9114")
+    private Long id;
+
+    @Schema(description = "操作标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "3035")
+    @NotEmpty(message = "操作标识不能为空")
+    private String operationId;
+
+    @Schema(description = "合同主信息主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10259")
+    @NotNull(message = "合同主信息主键不能为空")
+    private Long contractMainId;
+
+    @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同编号不能为空")
+    private String contractPaperNumber;
+
+    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "合同名称不能为空")
+    private String contractName;
+
+    @Schema(description = "合同类型编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同类型编号不能为空")
+    private String contractTypeNumber;
+
+    @Schema(description = "合同类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotEmpty(message = "合同类型名称不能为空")
+    private String contractTypeName;
+
+    @Schema(description = "合同类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同类别不能为空")
+    private String contractCategory;
+
+    @Schema(description = "是否虚拟合同", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "是否虚拟合同不能为空")
+    private String isVirtualContract;
+
+    @Schema(description = "客户/供应商编号;SAP客商公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "客户/供应商编号;SAP客商公司代码不能为空")
+    private String supplierNumber;
+
+    @Schema(description = "客户/供应商名称;SAP客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "客户/供应商名称;SAP客商公司名称不能为空")
+    private String supplierName;
+
+    @Schema(description = "代理方;SAP客商公司代码")
+    private String agent;
+
+    @Schema(description = "合同实施主体编号;SAP公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同实施主体编号;SAP公司代码不能为空")
+    private String contractImplementNumber;
+
+    @Schema(description = "合同签订主体编号;SAP公司代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同签订主体编号;SAP公司代码不能为空")
+    private String contractSignNumber;
+
+    @Schema(description = "合同签订日期;格式：YYYY-MM-DD", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "合同签订日期;格式：YYYY-MM-DD不能为空")
+    private LocalDate signDate;
+
+    @Schema(description = "合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期不能为空")
+    private LocalDate startDate;
+
+    @Schema(description = "合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期不能为空")
+    private LocalDate stopDate;
+
+    @Schema(description = "币种编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "币种编号不能为空")
+    private String currency;
+
+    @Schema(description = "合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00不能为空")
+    private BigDecimal sourceAmount;
+
+    @Schema(description = "合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00不能为空")
+    private BigDecimal basicAmount;
+
+    @Schema(description = "变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）不能为空")
+    private BigDecimal changeSourceAmount;
+
+    @Schema(description = "变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）不能为空")
+    private BigDecimal changeBasicAmount;
+
+    @Schema(description = "合同状态编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同状态编号不能为空")
+    private String statusNumber;
+
+    @Schema(description = "合同状态名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "合同状态名称不能为空")
+    private String statusName;
+
+    @Schema(description = "是否有预付款;长单合同:否，非长单:取合同的预付款", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "是否有预付款;长单合同:否，非长单:取合同的预付款不能为空")
+    private String isPrepayment;
+
+    @Schema(description = "预付款比例;有预付款则需要填写")
+    private BigDecimal prepaymentRatio;
+
+    @Schema(description = "预付款金额;有预付款则需要填写(通过计算得出)")
+    private BigDecimal prepaymentAmount;
+
+    @Schema(description = "履约保证金-变更前（原币）")
+    private BigDecimal sourceBeforeBond;
+
+    @Schema(description = "履约保证金-变更前（本位币）")
+    private BigDecimal basicBeforeBond;
+
+    @Schema(description = "履约保证金-变更后（原币）")
+    private BigDecimal sourceAfterBond;
+
+    @Schema(description = "履约保证金-变更后（本位币）")
+    private BigDecimal basicAfterBond;
+
+    @Schema(description = "是否含质保金", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "是否含质保金不能为空")
+    private String isQualityassuranceAmount;
+
+    @Schema(description = "质保金比例;有质保金则需要填写")
+    private BigDecimal qualityassuranceRatio;
+
+    @Schema(description = "质保金金额;有质保金则需要填写")
+    private BigDecimal qualityassuranceAmount;
+
+    @Schema(description = "是否内部企业", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "是否内部企业不能为空")
+    private String isInternal;
+
+    @Schema(description = "收支性质", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "收支性质不能为空")
+    private String nature;
+
+    @Schema(description = "备注信息;提交ERP")
+    private String remark;
+
+    @Schema(description = "累计结算金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulateSettlementAmount;
+
+    @Schema(description = "累计结算金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulateSettlementAmount;
+
+    @Schema(description = "累计已收付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceUseAmount;
+
+    @Schema(description = "累计已收付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicUseAmount;
+
+    @Schema(description = "累计已开收票金额（原币-含税）;暂定不传")
+    private BigDecimal sourceInvoiceAmount;
+
+    @Schema(description = "累计已开收票金额（本位币-含税）;暂定不传")
+    private BigDecimal basicInvoiceAmount;
+
+    @Schema(description = "累计预付款金额（原币-含税）;暂定不传")
+    private BigDecimal sourceAccumulatePrepayment;
+
+    @Schema(description = "累计预付款金额（本位币-含税）;暂定不传")
+    private BigDecimal basicAccumulatePrepayment;
+
+    @Schema(description = "履约保证金累计付款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateBond;
+
+    @Schema(description = "履约保证金累计付款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateBond;
+
+    @Schema(description = "履约保证金累计收款金额（原币）;暂定不传")
+    private BigDecimal sourceAccumulateAmount;
+
+    @Schema(description = "履约保证金累计收款金额（本位币）;暂定不传")
+    private BigDecimal basicAccumulateAmount;
+
+    @Schema(description = "是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00不能为空")
+    private String isFramework;
+
+    @Schema(description = "境内/境外", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "境内/境外不能为空")
+    private String isDomestic;
+
+    @Schema(description = "建筑服务发生地;销售合同，且类型为SAP02COSR必填")
+    private String architectureService‌Place;
+
+    @Schema(description = "达到收款条件金额;销售合同，且类型为SAP02COSR必填")
+    private BigDecimal payeeConditionAmount;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpInternalOrderPageReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 @Schema(description = "管理后台 - ERP内部订单分页 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpInternalOrderRespVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - ERP内部订单 Response VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpInternalOrderSaveReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - ERP内部订单新增/修改 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpProductiveOrderPageReqVO.java

@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP生产订单分页 Request VO")
+@Data
+public class ErpProductiveOrderPageReqVO extends PageParam {
+
+    @Schema(description = "公司编号")
+    private String companyNumber;
+
+    @Schema(description = "工厂编码")
+    private String factoryNumber;
+
+    @Schema(description = "工厂名称", example = "赵六")
+    private String factoryName;
+
+    @Schema(description = "订单编号")
+    private String orderNumber;
+
+    @Schema(description = "基本开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] startDate;
+
+    @Schema(description = "基本完成日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] endDate;
+
+    @Schema(description = "主产品物料编号")
+    private String mainMaterialNumber;
+
+    @Schema(description = "计量单位")
+    private String unit;
+
+    @Schema(description = "物料描述")
+    private String materialDescription;
+
+    @Schema(description = "工序列表")
+    private String processingList;
+
+    @Schema(description = "工序编号")
+    private String processingNumber;
+
+    @Schema(description = "工序描述")
+    private String processingDescription;
+
+    @Schema(description = "对象编号")
+    private String objectNumber;
+
+    @Schema(description = "工作中心编码")
+    private String workCenterNumber;
+
+    @Schema(description = "工作中心描述")
+    private String workCenterDescription;
+
+    @Schema(description = "成本中心编码")
+    private String costcenterNumber;
+
+    @Schema(description = "成本中心描述", example = "赵六")
+    private String costcenterName;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpProductiveOrderRespVO.java

@@ -0,0 +1,87 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP生产订单 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpProductiveOrderRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24243")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "公司编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("公司编号")
+    private String companyNumber;
+
+    @Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("工厂编码")
+    private String factoryNumber;
+
+    @Schema(description = "工厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("工厂名称")
+    private String factoryName;
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("订单编号")
+    private String orderNumber;
+
+    @Schema(description = "基本开始日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("基本开始日期")
+    private LocalDateTime startDate;
+
+    @Schema(description = "基本完成日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("基本完成日期")
+    private LocalDateTime endDate;
+
+    @Schema(description = "主产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("主产品物料编号")
+    private String mainMaterialNumber;
+
+    @Schema(description = "计量单位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("计量单位")
+    private String unit;
+
+    @Schema(description = "物料描述", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("物料描述")
+    private String materialDescription;
+
+    @Schema(description = "工序列表", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("工序列表")
+    private String processingList;
+
+    @Schema(description = "工序编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("工序编号")
+    private String processingNumber;
+
+    @Schema(description = "工序描述")
+    @ExcelProperty("工序描述")
+    private String processingDescription;
+
+    @Schema(description = "对象编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("对象编号")
+    private String objectNumber;
+
+    @Schema(description = "工作中心编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("工作中心编码")
+    private String workCenterNumber;
+
+    @Schema(description = "工作中心描述")
+    @ExcelProperty("工作中心描述")
+    private String workCenterDescription;
+
+    @Schema(description = "成本中心编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("成本中心编码")
+    private String costcenterNumber;
+
+    @Schema(description = "成本中心描述", example = "赵六")
+    @ExcelProperty("成本中心描述")
+    private String costcenterName;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpProductiveOrderSaveReqVO.java

@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP生产订单新增/修改 Request VO")
+@Data
+public class ErpProductiveOrderSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24243")
+    private Long id;
+
+    @Schema(description = "公司编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "公司编号不能为空")
+    private String companyNumber;
+
+    @Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "工厂编码不能为空")
+    private String factoryNumber;
+
+    @Schema(description = "工厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "工厂名称不能为空")
+    private String factoryName;
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "订单编号不能为空")
+    private String orderNumber;
+
+    @Schema(description = "基本开始日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "基本开始日期不能为空")
+    private LocalDateTime startDate;
+
+    @Schema(description = "基本完成日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "基本完成日期不能为空")
+    private LocalDateTime endDate;
+
+    @Schema(description = "主产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "主产品物料编号不能为空")
+    private String mainMaterialNumber;
+
+    @Schema(description = "计量单位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "计量单位不能为空")
+    private String unit;
+
+    @Schema(description = "物料描述", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "物料描述不能为空")
+    private String materialDescription;
+
+    @Schema(description = "工序列表", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "工序列表不能为空")
+    private String processingList;
+
+    @Schema(description = "工序编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "工序编号不能为空")
+    private String processingNumber;
+
+    @Schema(description = "工序描述")
+    private String processingDescription;
+
+    @Schema(description = "对象编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "对象编号不能为空")
+    private String objectNumber;
+
+    @Schema(description = "工作中心编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "工作中心编码不能为空")
+    private String workCenterNumber;
+
+    @Schema(description = "工作中心描述")
+    private String workCenterDescription;
+
+    @Schema(description = "成本中心编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "成本中心编码不能为空")
+    private String costcenterNumber;
+
+    @Schema(description = "成本中心描述", example = "赵六")
+    private String costcenterName;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpPurchaseOrganizationPageReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 @Schema(description = "管理后台 - ERP采购组织分页 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpPurchaseOrganizationRespVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - ERP采购组织 Response VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpPurchaseOrganizationSaveReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - ERP采购组织新增/修改 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpSalesOrganizationPageReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 @Schema(description = "管理后台 - ERP销售组织分页 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpSalesOrganizationRespVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - ERP销售组织 Response VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpSalesOrganizationSaveReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - ERP销售组织新增/修改 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpWarehousePageReqVO.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpWarehouseRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - ERP库位 Response VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/vo/ErpWarehouseSaveReqVO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - ERP库位新增/修改 Request VO")
 @Data

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpAssetDO.java

@@ -0,0 +1,110 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+/**
+* ERP资产卡片 DO
+*
+* @author 后台管理
+*/
+@TableName("sply_erp_ast")
+@KeySequence("sply_erp_ast_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class ErpAssetDO extends BaseDO {
+
+
+
+    /**
+    * 主键
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 公司编号
+    */
+    @TableField("CPN_NUM")
+    private String companyNumber;
+    /**
+    * 资产主编码
+    */
+    @TableField("MAIN_AST_NUM")
+    private String mainAssetNumber;
+    /**
+    * 记录创建日期
+    */
+    @TableField("RCD_CRT_DT")
+    private LocalDateTime recordCreateDate;
+    /**
+    * 更改用户名
+    */
+    @TableField("UPD_USER_NAME")
+    private String updateUserName;
+    /**
+    * 资产类编号
+    */
+    @TableField("AST_TP_NUM")
+    private String assetTypeNumber;
+    /**
+    * 资产类描述
+    */
+    @TableField("AST_TP_NAME")
+    private String assetTypeName;
+    /**
+    * 资产资本化日期
+    */
+    @TableField("AST_DT")
+    private LocalDateTime assetDate;
+    /**
+    * 基本计量单位
+    */
+    @TableField("UOM")
+    private String uom;
+    /**
+    * 数量
+    */
+    @TableField("QTY")
+    private BigDecimal quantity;
+    /**
+    * 资产描述
+    */
+    @TableField("AST_DSP")
+    private String assetDescription;
+    /**
+    * 附加资产描述
+    */
+    @TableField("AST_DSP_ATT")
+    private String assetDescriptionAttach;
+    /**
+    * 折旧计算开始日期
+    */
+    @TableField("DEPR_STRT_DT")
+    private LocalDateTime depreciationStartDate;
+    /**
+    * 计划年使用期
+    */
+    @TableField("PLN_YR_DT")
+    private LocalDateTime planYearDate;
+    /**
+    * 成本中心编码
+    */
+    @TableField("CCTR_NUM")
+    private String costcenterNumber;
+    /**
+    * 责任成本中心
+    */
+    @TableField("DUTY_CCTR_NUM")
+    private String dutyCostcenterNumber;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpContractDO.java

@@ -0,0 +1,330 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * ERP合同映射 DO
+ *
+ * @author 后台管理
+ */
+@TableName("bse_erp_ctrt")
+@KeySequence("bse_erp_ctrt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+ * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+ */
+public class ErpContractDO extends BaseDO {
+
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 操作标识
+     */
+    @TableField("OPTN_ID")
+    private String operationId;
+    /**
+     * 合同主信息主键
+     */
+    @TableField("CTRT_MAIN_ID")
+    private Long contractMainId;
+    /**
+     * 合同编号
+     */
+    @TableField("CTRT_PPR_NUM")
+    private String contractPaperNumber;
+    /**
+     * 合同名称
+     */
+    @TableField("CTRT_NAME")
+    private String contractName;
+    /**
+     * 合同类型编号
+     */
+    @TableField("CTRT_TP_NUM")
+    private String contractTypeNumber;
+    /**
+     * 合同类型名称
+     */
+    @TableField("CTRT_TP_NAME")
+    private String contractTypeName;
+    /**
+     * 合同类别
+     */
+    @TableField("CTRT_CTGR")
+    private String contractCategory;
+    /**
+     * 是否虚拟合同
+     */
+    @TableField("IS_VRTL_CTRT")
+    private String isVirtualContract;
+    /**
+     * 客户/供应商编号;SAP客商公司代码
+     */
+    @TableField("SPLR_NUM")
+    private String supplierNumber;
+    /**
+     * 客户/供应商名称;SAP客商公司名称
+     */
+    @TableField("SPLR_NAME")
+    private String supplierName;
+    /**
+     * 代理方;SAP客商公司代码
+     */
+    @TableField("AGT")
+    private String agent;
+    /**
+     * 合同实施主体编号;SAP公司代码
+     */
+    @TableField("CTRT_IMPL_NUM")
+    private String contractImplementNumber;
+    /**
+     * 合同签订主体编号;SAP公司代码
+     */
+    @TableField("CTRT_SGN_NUM")
+    private String contractSignNumber;
+    /**
+     * 合同签订日期;格式：YYYY-MM-DD
+     */
+    @TableField("SGN_DT")
+    private LocalDate signDate;
+    /**
+     * 合同起始日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期
+     */
+    @TableField("STRT_DT")
+    private LocalDate startDate;
+    /**
+     * 合同终止日期;格式：YYYY-MM-DD，长单合同：长单合同起始日期 非长单：合同合同签订日期
+     */
+    @TableField("STOP_DT")
+    private LocalDate stopDate;
+    /**
+     * 币种编号
+     */
+    @TableField("CUR")
+    private String currency;
+    /**
+     * 合同总金额（原币-含税）;非长单合同：合同金额 长单合同：默认1000000000000000.00
+     */
+    @TableField("SRC_AMT")
+    private BigDecimal sourceAmount;
+    /**
+     * 合同总金额（本位币-含税）;非长单合同：合同金额*合同的临时汇率 长单合同：默认1000000000000000.00
+     */
+    @TableField("BSC_AMT")
+    private BigDecimal basicAmount;
+    /**
+     * 变更后合同总金额（原币-含税）;如果未做合同变更，金额等于合同总金额（原币-含税）
+     */
+    @TableField("CHG_SRC_AMT")
+    private BigDecimal changeSourceAmount;
+    /**
+     * 变更后合同总金额（本位币-含税）;如果未做合同变更，金额等于合同总金额（本位币-含税）
+     */
+    @TableField("CHG_BSC_AMT")
+    private BigDecimal changeBasicAmount;
+    /**
+     * 合同状态编号
+     */
+    @TableField("STS_NUM")
+    private String statusNumber;
+    /**
+     * 合同状态名称
+     */
+    @TableField("STS_NAME")
+    private String statusName;
+    /**
+     * 是否有预付款;长单合同:否，非长单:取合同的预付款
+     */
+    @TableField("IS_PPYM")
+    private String isPrepayment;
+    /**
+     * 预付款比例;有预付款则需要填写
+     */
+    @TableField("PPYM_RTIO")
+    private BigDecimal prepaymentRatio;
+    /**
+     * 预付款金额;有预付款则需要填写(通过计算得出)
+     */
+    @TableField("PPYM_AMT")
+    private BigDecimal prepaymentAmount;
+    /**
+     * 履约保证金-变更前（原币）
+     */
+    @TableField("SRC_BFR_BND")
+    private BigDecimal sourceBeforeBond;
+    /**
+     * 履约保证金-变更前（本位币）
+     */
+    @TableField("BSC_BFR_BND")
+    private BigDecimal basicBeforeBond;
+    /**
+     * 履约保证金-变更后（原币）
+     */
+    @TableField("SRC_AFT_BND")
+    private BigDecimal sourceAfterBond;
+    /**
+     * 履约保证金-变更后（本位币）
+     */
+    @TableField("BSC_AFT_BND")
+    private BigDecimal basicAfterBond;
+    /**
+     * 是否含质保金
+     */
+    @TableField("IS_QUA_AMT")
+    private String isQualityassuranceAmount;
+    /**
+     * 质保金比例;有质保金则需要填写
+     */
+    @TableField("QUA_RTIO")
+    private BigDecimal qualityassuranceRatio;
+    /**
+     * 质保金金额;有质保金则需要填写
+     */
+    @TableField("QUA_AMT")
+    private BigDecimal qualityassuranceAmount;
+    /**
+     * 是否内部企业
+     */
+    @TableField("IS_INTL")
+    private String isInternal;
+    /**
+     * 收支性质
+     */
+    @TableField("NTR")
+    private String nature;
+    /**
+     * 备注信息;提交ERP
+     */
+    @TableField("RMK")
+    private String remark;
+    /**
+     * 累计结算金额（原币-含税）;暂定不传
+     */
+    @TableField("SRC_ACC_STLM_AMT")
+    private BigDecimal sourceAccumulateSettlementAmount;
+    /**
+     * 累计结算金额（本位币-含税）;暂定不传
+     */
+    @TableField("BSC_ACC_STLM_AMT")
+    private BigDecimal basicAccumulateSettlementAmount;
+    /**
+     * 累计已收付款金额（原币-含税）;暂定不传
+     */
+    @TableField("SRC_USE_AMT")
+    private BigDecimal sourceUseAmount;
+    /**
+     * 累计已收付款金额（本位币-含税）;暂定不传
+     */
+    @TableField("BSC_USE_AMT")
+    private BigDecimal basicUseAmount;
+    /**
+     * 累计已开收票金额（原币-含税）;暂定不传
+     */
+    @TableField("SRC_INV_AMT")
+    private BigDecimal sourceInvoiceAmount;
+    /**
+     * 累计已开收票金额（本位币-含税）;暂定不传
+     */
+    @TableField("BSC_INV_AMT")
+    private BigDecimal basicInvoiceAmount;
+    /**
+     * 累计预付款金额（原币-含税）;暂定不传
+     */
+    @TableField("SRC_ACC_PPYM")
+    private BigDecimal sourceAccumulatePrepayment;
+    /**
+     * 累计预付款金额（本位币-含税）;暂定不传
+     */
+    @TableField("BSC_ACC_PPYM")
+    private BigDecimal basicAccumulatePrepayment;
+    /**
+     * 履约保证金累计付款金额（原币）;暂定不传
+     */
+    @TableField("SRC_ACC_BND")
+    private BigDecimal sourceAccumulateBond;
+    /**
+     * 履约保证金累计付款金额（本位币）;暂定不传
+     */
+    @TableField("BSC_ACC_BND")
+    private BigDecimal basicAccumulateBond;
+    /**
+     * 履约保证金累计收款金额（原币）;暂定不传
+     */
+    @TableField("SRC_ACC_AMT")
+    private BigDecimal sourceAccumulateAmount;
+    /**
+     * 履约保证金累计收款金额（本位币）;暂定不传
+     */
+    @TableField("BSC_ACC_AMT")
+    private BigDecimal basicAccumulateAmount;
+    /**
+     * 是否框架合同;如果为是，合同总金额（本币）、合同总金额（原币）、变更后合同总金额（原币-含税）、变更后合同总金额（本位币-含税）赋默认值为：1000000000000000.00
+     */
+    @TableField("IS_FMWK")
+    private String isFramework;
+    /**
+     * 境内/境外
+     */
+    @TableField("IS_DOM")
+    private String isDomestic;
+    /**
+     * 建筑服务发生地;销售合同，且类型为SAP02COSR必填
+     */
+    @TableField("ARCH_SVC_PLCE")
+    private String architectureService‌Place;
+    /**
+     * 达到收款条件金额;销售合同，且类型为SAP02COSR必填
+     */
+    @TableField("PYEE_CND_AMT")
+    private BigDecimal payeeConditionAmount;
+    /**
+     * 公司编号
+     */
+    @TableField("COMPANY_ID")
+    private Long companyId;
+    /**
+     * 公司名称
+     */
+    @TableField("COMPANY_NAME")
+    private String companyName;
+    /**
+     * 部门编号
+     */
+    @TableField("DEPT_ID")
+    private Long deptId;
+    /**
+     * 部门名称
+     */
+    @TableField("DEPT_NAME")
+    private String deptName;
+    /**
+     * 岗位编号
+     */
+    @TableField("POST_ID")
+    private Long postId;
+    /**
+     * 创建者
+     */
+    @TableField("CREATOR_NAME")
+    private String creatorName;
+    /**
+     * 更新者
+     */
+    @TableField("UPDATER_NAME")
+    private String updaterName;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 /**
 * ERP内部订单 DO
 *

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpProductiveOrderDO.java

@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+/**
+* ERP生产订单 DO
+*
+* @author 后台管理
+*/
+@TableName("sply_erp_pdtv_ord")
+@KeySequence("sply_erp_pdtv_ord_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class ErpProductiveOrderDO extends BaseDO {
+
+
+
+    /**
+    * 主键
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 公司编号
+    */
+    @TableField("CPN_NUM")
+    private String companyNumber;
+    /**
+    * 工厂编码
+    */
+    @TableField("FACT_NUM")
+    private String factoryNumber;
+    /**
+    * 工厂名称
+    */
+    @TableField("FACT_NAME")
+    private String factoryName;
+    /**
+    * 订单编号
+    */
+    @TableField("ORD_NUM")
+    private String orderNumber;
+    /**
+    * 基本开始日期
+    */
+    @TableField("STRT_DT")
+    private LocalDateTime startDate;
+    /**
+    * 基本完成日期
+    */
+    @TableField("END_DT")
+    private LocalDateTime endDate;
+    /**
+    * 主产品物料编号
+    */
+    @TableField("MAIN_MTRL_NUM")
+    private String mainMaterialNumber;
+    /**
+    * 计量单位
+    */
+    @TableField("UNT")
+    private String unit;
+    /**
+    * 物料描述
+    */
+    @TableField("MTRL_DSP")
+    private String materialDescription;
+    /**
+    * 工序列表
+    */
+    @TableField("PROC_LIST")
+    private String processingList;
+    /**
+    * 工序编号
+    */
+    @TableField("PROC_NUM")
+    private String processingNumber;
+    /**
+    * 工序描述
+    */
+    @TableField("PROC_DSP")
+    private String processingDescription;
+    /**
+    * 对象编号
+    */
+    @TableField("OBJ_NUM")
+    private String objectNumber;
+    /**
+    * 工作中心编码
+    */
+    @TableField("WRK_CTR_NUM")
+    private String workCenterNumber;
+    /**
+    * 工作中心描述
+    */
+    @TableField("WRK_CTR_DSP")
+    private String workCenterDescription;
+    /**
+    * 成本中心编码
+    */
+    @TableField("CCTR_NUM")
+    private String costcenterNumber;
+    /**
+    * 成本中心描述
+    */
+    @TableField("CCTR_NAME")
+    private String costcenterName;
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpPurchaseOrganizationDO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 /**
 * ERP采购组织 DO
 *

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpSalesOrganizationDO.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 /**
 * ERP销售组织 DO
 *

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/erp/ErpWarehouseDO.java

@@ -1,11 +1,8 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.erp;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 /**
 * ERP库位 DO
 *

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpAssetMapper.java

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetPageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpAssetDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ERP资产卡片 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface ErpAssetMapper extends BaseMapperX<ErpAssetDO> {
+
+    default PageResult<ErpAssetDO> selectPage(ErpAssetPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ErpAssetDO>()
+                .eqIfPresent(ErpAssetDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .eqIfPresent(ErpAssetDO::getMainAssetNumber, reqVO.getMainAssetNumber())
+                .betweenIfPresent(ErpAssetDO::getRecordCreateDate, reqVO.getRecordCreateDate())
+                .likeIfPresent(ErpAssetDO::getUpdateUserName, reqVO.getUpdateUserName())
+                .eqIfPresent(ErpAssetDO::getAssetTypeNumber, reqVO.getAssetTypeNumber())
+                .likeIfPresent(ErpAssetDO::getAssetTypeName, reqVO.getAssetTypeName())
+                .betweenIfPresent(ErpAssetDO::getAssetDate, reqVO.getAssetDate())
+                .eqIfPresent(ErpAssetDO::getUom, reqVO.getUom())
+                .eqIfPresent(ErpAssetDO::getQuantity, reqVO.getQuantity())
+                .eqIfPresent(ErpAssetDO::getAssetDescription, reqVO.getAssetDescription())
+                .eqIfPresent(ErpAssetDO::getAssetDescriptionAttach, reqVO.getAssetDescriptionAttach())
+                .betweenIfPresent(ErpAssetDO::getDepreciationStartDate, reqVO.getDepreciationStartDate())
+                .betweenIfPresent(ErpAssetDO::getPlanYearDate, reqVO.getPlanYearDate())
+                .eqIfPresent(ErpAssetDO::getCostcenterNumber, reqVO.getCostcenterNumber())
+                .eqIfPresent(ErpAssetDO::getDutyCostcenterNumber, reqVO.getDutyCostcenterNumber())
+                .orderByDesc(ErpAssetDO::getId));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpContractMapper.java

@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractPageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpContractDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ERP合同映射 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface ErpContractMapper extends BaseMapperX<ErpContractDO> {
+
+    default PageResult<ErpContractDO> selectPage(ErpContractPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ErpContractDO>()
+                .eqIfPresent(ErpContractDO::getOperationId, reqVO.getOperationId())
+                .eqIfPresent(ErpContractDO::getContractMainId, reqVO.getContractMainId())
+                .eqIfPresent(ErpContractDO::getContractPaperNumber, reqVO.getContractPaperNumber())
+                .likeIfPresent(ErpContractDO::getContractName, reqVO.getContractName())
+                .eqIfPresent(ErpContractDO::getContractTypeNumber, reqVO.getContractTypeNumber())
+                .likeIfPresent(ErpContractDO::getContractTypeName, reqVO.getContractTypeName())
+                .eqIfPresent(ErpContractDO::getContractCategory, reqVO.getContractCategory())
+                .eqIfPresent(ErpContractDO::getIsVirtualContract, reqVO.getIsVirtualContract())
+                .eqIfPresent(ErpContractDO::getSupplierNumber, reqVO.getSupplierNumber())
+                .likeIfPresent(ErpContractDO::getSupplierName, reqVO.getSupplierName())
+                .eqIfPresent(ErpContractDO::getAgent, reqVO.getAgent())
+                .eqIfPresent(ErpContractDO::getContractImplementNumber, reqVO.getContractImplementNumber())
+                .eqIfPresent(ErpContractDO::getContractSignNumber, reqVO.getContractSignNumber())
+                .betweenIfPresent(ErpContractDO::getSignDate, reqVO.getSignDate())
+                .betweenIfPresent(ErpContractDO::getStartDate, reqVO.getStartDate())
+                .betweenIfPresent(ErpContractDO::getStopDate, reqVO.getStopDate())
+                .eqIfPresent(ErpContractDO::getCurrency, reqVO.getCurrency())
+                .eqIfPresent(ErpContractDO::getSourceAmount, reqVO.getSourceAmount())
+                .eqIfPresent(ErpContractDO::getBasicAmount, reqVO.getBasicAmount())
+                .eqIfPresent(ErpContractDO::getChangeSourceAmount, reqVO.getChangeSourceAmount())
+                .eqIfPresent(ErpContractDO::getChangeBasicAmount, reqVO.getChangeBasicAmount())
+                .eqIfPresent(ErpContractDO::getStatusNumber, reqVO.getStatusNumber())
+                .likeIfPresent(ErpContractDO::getStatusName, reqVO.getStatusName())
+                .eqIfPresent(ErpContractDO::getIsPrepayment, reqVO.getIsPrepayment())
+                .eqIfPresent(ErpContractDO::getPrepaymentRatio, reqVO.getPrepaymentRatio())
+                .eqIfPresent(ErpContractDO::getPrepaymentAmount, reqVO.getPrepaymentAmount())
+                .eqIfPresent(ErpContractDO::getSourceBeforeBond, reqVO.getSourceBeforeBond())
+                .eqIfPresent(ErpContractDO::getBasicBeforeBond, reqVO.getBasicBeforeBond())
+                .eqIfPresent(ErpContractDO::getSourceAfterBond, reqVO.getSourceAfterBond())
+                .eqIfPresent(ErpContractDO::getBasicAfterBond, reqVO.getBasicAfterBond())
+                .eqIfPresent(ErpContractDO::getIsQualityassuranceAmount, reqVO.getIsQualityassuranceAmount())
+                .eqIfPresent(ErpContractDO::getQualityassuranceRatio, reqVO.getQualityassuranceRatio())
+                .eqIfPresent(ErpContractDO::getQualityassuranceAmount, reqVO.getQualityassuranceAmount())
+                .eqIfPresent(ErpContractDO::getIsInternal, reqVO.getIsInternal())
+                .eqIfPresent(ErpContractDO::getNature, reqVO.getNature())
+                .eqIfPresent(ErpContractDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(ErpContractDO::getSourceAccumulateSettlementAmount, reqVO.getSourceAccumulateSettlementAmount())
+                .eqIfPresent(ErpContractDO::getBasicAccumulateSettlementAmount, reqVO.getBasicAccumulateSettlementAmount())
+                .eqIfPresent(ErpContractDO::getSourceUseAmount, reqVO.getSourceUseAmount())
+                .eqIfPresent(ErpContractDO::getBasicUseAmount, reqVO.getBasicUseAmount())
+                .eqIfPresent(ErpContractDO::getSourceInvoiceAmount, reqVO.getSourceInvoiceAmount())
+                .eqIfPresent(ErpContractDO::getBasicInvoiceAmount, reqVO.getBasicInvoiceAmount())
+                .eqIfPresent(ErpContractDO::getSourceAccumulatePrepayment, reqVO.getSourceAccumulatePrepayment())
+                .eqIfPresent(ErpContractDO::getBasicAccumulatePrepayment, reqVO.getBasicAccumulatePrepayment())
+                .eqIfPresent(ErpContractDO::getSourceAccumulateBond, reqVO.getSourceAccumulateBond())
+                .eqIfPresent(ErpContractDO::getBasicAccumulateBond, reqVO.getBasicAccumulateBond())
+                .eqIfPresent(ErpContractDO::getSourceAccumulateAmount, reqVO.getSourceAccumulateAmount())
+                .eqIfPresent(ErpContractDO::getBasicAccumulateAmount, reqVO.getBasicAccumulateAmount())
+                .eqIfPresent(ErpContractDO::getIsFramework, reqVO.getIsFramework())
+                .eqIfPresent(ErpContractDO::getIsDomestic, reqVO.getIsDomestic())
+                .eqIfPresent(ErpContractDO::getArchitectureService‌Place, reqVO.getArchitectureService‌Place())
+                .eqIfPresent(ErpContractDO::getPayeeConditionAmount, reqVO.getPayeeConditionAmount())
+                .betweenIfPresent(ErpContractDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ErpContractDO::getId));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.erp.dal.mysql.erp;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 
 /**
  * ERP内部订单 Mapper

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpProductiveOrderDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ERP生产订单 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface ErpProductiveOrderMapper extends BaseMapperX<ErpProductiveOrderDO> {
+
+    default PageResult<ErpProductiveOrderDO> selectPage(ErpProductiveOrderPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ErpProductiveOrderDO>()
+                .eqIfPresent(ErpProductiveOrderDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .eqIfPresent(ErpProductiveOrderDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getFactoryName, reqVO.getFactoryName())
+                .eqIfPresent(ErpProductiveOrderDO::getOrderNumber, reqVO.getOrderNumber())
+                .betweenIfPresent(ErpProductiveOrderDO::getStartDate, reqVO.getStartDate())
+                .betweenIfPresent(ErpProductiveOrderDO::getEndDate, reqVO.getEndDate())
+                .eqIfPresent(ErpProductiveOrderDO::getMainMaterialNumber, reqVO.getMainMaterialNumber())
+                .eqIfPresent(ErpProductiveOrderDO::getUnit, reqVO.getUnit())
+                .eqIfPresent(ErpProductiveOrderDO::getMaterialDescription, reqVO.getMaterialDescription())
+                .eqIfPresent(ErpProductiveOrderDO::getProcessingList, reqVO.getProcessingList())
+                .eqIfPresent(ErpProductiveOrderDO::getProcessingNumber, reqVO.getProcessingNumber())
+                .eqIfPresent(ErpProductiveOrderDO::getProcessingDescription, reqVO.getProcessingDescription())
+                .eqIfPresent(ErpProductiveOrderDO::getObjectNumber, reqVO.getObjectNumber())
+                .eqIfPresent(ErpProductiveOrderDO::getWorkCenterNumber, reqVO.getWorkCenterNumber())
+                .eqIfPresent(ErpProductiveOrderDO::getWorkCenterDescription, reqVO.getWorkCenterDescription())
+                .eqIfPresent(ErpProductiveOrderDO::getCostcenterNumber, reqVO.getCostcenterNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getCostcenterName, reqVO.getCostcenterName())
+                .orderByDesc(ErpProductiveOrderDO::getId));
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.erp.dal.mysql.erp;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 
 /**
  * ERP采购组织 Mapper

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.erp.dal.mysql.erp;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 
 /**
  * ERP销售组织 Mapper

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/erp/ErpWarehouseMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.erp.dal.mysql.erp;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
 
 /**
  * ERP库位 Mapper

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpAssetService.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpAssetDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * ERP资产卡片 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface ErpAssetService {
+
+    /**
+     * 创建ERP资产卡片
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    ErpAssetRespVO createErpAsset(@Valid ErpAssetSaveReqVO createReqVO);
+
+    /**
+     * 更新ERP资产卡片
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateErpAsset(@Valid ErpAssetSaveReqVO updateReqVO);
+
+    /**
+     * 删除ERP资产卡片
+     *
+     * @param id 编号
+     */
+    void deleteErpAsset(Long id);
+
+    /**
+    * 批量删除ERP资产卡片
+    *
+    * @param ids 编号
+    */
+    void deleteErpAssetListByIds(List<Long> ids);
+
+    /**
+     * 获得ERP资产卡片
+     *
+     * @param id 编号
+     * @return ERP资产卡片
+     */
+    ErpAssetDO getErpAsset(Long id);
+
+    /**
+     * 获得ERP资产卡片分页
+     *
+     * @param pageReqVO 分页查询
+     * @return ERP资产卡片分页
+     */
+    PageResult<ErpAssetDO> getErpAssetPage(ErpAssetPageReqVO pageReqVO);
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpAssetServiceImpl.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpAssetSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpAssetDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpAssetMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_ASSET_NOT_EXISTS;
+
+/**
+ * ERP资产卡片 Service 实现类
+ *
+ * @author 后台管理
+ */
+@Service
+@Validated
+public class ErpAssetServiceImpl implements ErpAssetService {
+
+    @Resource
+    private ErpAssetMapper erpAssetMapper;
+
+    @Override
+    public ErpAssetRespVO createErpAsset(ErpAssetSaveReqVO createReqVO) {
+        // 插入
+        ErpAssetDO erpAsset = BeanUtils.toBean(createReqVO, ErpAssetDO.class);
+        erpAssetMapper.insert(erpAsset);
+        // 返回
+        return BeanUtils.toBean(erpAsset, ErpAssetRespVO.class);
+    }
+
+    @Override
+    public void updateErpAsset(ErpAssetSaveReqVO updateReqVO) {
+        // 校验存在
+        validateErpAssetExists(updateReqVO.getId());
+        // 更新
+        ErpAssetDO updateObj = BeanUtils.toBean(updateReqVO, ErpAssetDO.class);
+        erpAssetMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteErpAsset(Long id) {
+        // 校验存在
+        validateErpAssetExists(id);
+        // 删除
+        erpAssetMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteErpAssetListByIds(List<Long> ids) {
+        // 校验存在
+        validateErpAssetExists(ids);
+        // 删除
+        erpAssetMapper.deleteByIds(ids);
+        }
+
+    private void validateErpAssetExists(List<Long> ids) {
+        List<ErpAssetDO> list = erpAssetMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(ERP_ASSET_NOT_EXISTS);
+        }
+    }
+
+    private void validateErpAssetExists(Long id) {
+        if (erpAssetMapper.selectById(id) == null) {
+            throw exception(ERP_ASSET_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ErpAssetDO getErpAsset(Long id) {
+        return erpAssetMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ErpAssetDO> getErpAssetPage(ErpAssetPageReqVO pageReqVO) {
+        return erpAssetMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpCompanyServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpCompanyDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpCompanyMapper;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -99,6 +100,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
 
     @Override
     @Transactional
+    @XxlJob("getCompanyTask")
     public void callErpRfcInterface() {
         try {
             OftenEnum.FuncnrEnum funcnrEnum =OftenEnum.FuncnrEnum.公司代码;

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpContractService.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpContractDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * ERP合同映射 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface ErpContractService {
+
+    /**
+     * 创建ERP合同映射
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    ErpContractRespVO createErpContract(@Valid ErpContractSaveReqVO createReqVO);
+
+    /**
+     * 更新ERP合同映射
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateErpContract(@Valid ErpContractSaveReqVO updateReqVO);
+
+    /**
+     * 删除ERP合同映射
+     *
+     * @param id 编号
+     */
+    void deleteErpContract(Long id);
+
+    /**
+    * 批量删除ERP合同映射
+    *
+    * @param ids 编号
+    */
+    void deleteErpContractListByIds(List<Long> ids);
+
+    /**
+     * 获得ERP合同映射
+     *
+     * @param id 编号
+     * @return ERP合同映射
+     */
+    ErpContractDO getErpContract(Long id);
+
+    /**
+     * 获得ERP合同映射分页
+     *
+     * @param pageReqVO 分页查询
+     * @return ERP合同映射分页
+     */
+    PageResult<ErpContractDO> getErpContractPage(ErpContractPageReqVO pageReqVO);
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpContractServiceImpl.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpContractDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpContractMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_CONTRACT_NOT_EXISTS;
+
+/**
+ * ERP合同映射 Service 实现类
+ *
+ * @author 后台管理
+ */
+@Service
+@Validated
+public class ErpContractServiceImpl implements ErpContractService {
+
+    @Resource
+    private ErpContractMapper erpContractMapper;
+
+    @Override
+    public ErpContractRespVO createErpContract(ErpContractSaveReqVO createReqVO) {
+        // 插入
+        ErpContractDO erpContract = BeanUtils.toBean(createReqVO, ErpContractDO.class);
+        erpContractMapper.insert(erpContract);
+        // 返回
+        return BeanUtils.toBean(erpContract, ErpContractRespVO.class);
+    }
+
+    @Override
+    public void updateErpContract(ErpContractSaveReqVO updateReqVO) {
+        // 校验存在
+        validateErpContractExists(updateReqVO.getId());
+        // 更新
+        ErpContractDO updateObj = BeanUtils.toBean(updateReqVO, ErpContractDO.class);
+        erpContractMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteErpContract(Long id) {
+        // 校验存在
+        validateErpContractExists(id);
+        // 删除
+        erpContractMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteErpContractListByIds(List<Long> ids) {
+        // 校验存在
+        validateErpContractExists(ids);
+        // 删除
+        erpContractMapper.deleteByIds(ids);
+        }
+
+    private void validateErpContractExists(List<Long> ids) {
+        List<ErpContractDO> list = erpContractMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(ERP_CONTRACT_NOT_EXISTS);
+        }
+    }
+
+    private void validateErpContractExists(Long id) {
+        if (erpContractMapper.selectById(id) == null) {
+            throw exception(ERP_CONTRACT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ErpContractDO getErpContract(Long id) {
+        return erpContractMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ErpContractDO> getErpContractPage(ErpContractPageReqVO pageReqVO) {
+        return erpContractMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpInternalOrderService.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * ERP内部订单 Service 接口

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpInternalOrderServiceImpl.java

@@ -1,24 +1,21 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpInternalOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpInternalOrderDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpInternalOrderMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_INTERNAL_ORDER_NOT_EXISTS;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
 
 /**
  * ERP内部订单 Service 实现类

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpProductiveOrderService.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpProductiveOrderDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * ERP生产订单 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface ErpProductiveOrderService {
+
+    /**
+     * 创建ERP生产订单
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    ErpProductiveOrderRespVO createErpProductiveOrder(@Valid ErpProductiveOrderSaveReqVO createReqVO);
+
+    /**
+     * 更新ERP生产订单
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateErpProductiveOrder(@Valid ErpProductiveOrderSaveReqVO updateReqVO);
+
+    /**
+     * 删除ERP生产订单
+     *
+     * @param id 编号
+     */
+    void deleteErpProductiveOrder(Long id);
+
+    /**
+    * 批量删除ERP生产订单
+    *
+    * @param ids 编号
+    */
+    void deleteErpProductiveOrderListByIds(List<Long> ids);
+
+    /**
+     * 获得ERP生产订单
+     *
+     * @param id 编号
+     * @return ERP生产订单
+     */
+    ErpProductiveOrderDO getErpProductiveOrder(Long id);
+
+    /**
+     * 获得ERP生产订单分页
+     *
+     * @param pageReqVO 分页查询
+     * @return ERP生产订单分页
+     */
+    PageResult<ErpProductiveOrderDO> getErpProductiveOrderPage(ErpProductiveOrderPageReqVO pageReqVO);
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpProductiveOrderServiceImpl.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.erp.service.erp;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpProductiveOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpProductiveOrderDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpProductiveOrderMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_PRODUCTIVE_ORDER_NOT_EXISTS;
+
+/**
+ * ERP生产订单 Service 实现类
+ *
+ * @author 后台管理
+ */
+@Service
+@Validated
+public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService {
+
+    @Resource
+    private ErpProductiveOrderMapper erpProductiveOrderMapper;
+
+    @Override
+    public ErpProductiveOrderRespVO createErpProductiveOrder(ErpProductiveOrderSaveReqVO createReqVO) {
+        // 插入
+        ErpProductiveOrderDO erpProductiveOrder = BeanUtils.toBean(createReqVO, ErpProductiveOrderDO.class);
+        erpProductiveOrderMapper.insert(erpProductiveOrder);
+        // 返回
+        return BeanUtils.toBean(erpProductiveOrder, ErpProductiveOrderRespVO.class);
+    }
+
+    @Override
+    public void updateErpProductiveOrder(ErpProductiveOrderSaveReqVO updateReqVO) {
+        // 校验存在
+        validateErpProductiveOrderExists(updateReqVO.getId());
+        // 更新
+        ErpProductiveOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpProductiveOrderDO.class);
+        erpProductiveOrderMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteErpProductiveOrder(Long id) {
+        // 校验存在
+        validateErpProductiveOrderExists(id);
+        // 删除
+        erpProductiveOrderMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteErpProductiveOrderListByIds(List<Long> ids) {
+        // 校验存在
+        validateErpProductiveOrderExists(ids);
+        // 删除
+        erpProductiveOrderMapper.deleteByIds(ids);
+        }
+
+    private void validateErpProductiveOrderExists(List<Long> ids) {
+        List<ErpProductiveOrderDO> list = erpProductiveOrderMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(ERP_PRODUCTIVE_ORDER_NOT_EXISTS);
+        }
+    }
+
+    private void validateErpProductiveOrderExists(Long id) {
+        if (erpProductiveOrderMapper.selectById(id) == null) {
+            throw exception(ERP_PRODUCTIVE_ORDER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ErpProductiveOrderDO getErpProductiveOrder(Long id) {
+        return erpProductiveOrderMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ErpProductiveOrderDO> getErpProductiveOrderPage(ErpProductiveOrderPageReqVO pageReqVO) {
+        return erpProductiveOrderMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpPurchaseOrganizationService.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * ERP采购组织 Service 接口

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java

@@ -1,24 +1,21 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpPurchaseOrganizationSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpPurchaseOrganizationDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpPurchaseOrganizationMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_PURCHASE_ORGANIZATION_NOT_EXISTS;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
 
 /**
  * ERP采购组织 Service 实现类

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpSalesOrganizationService.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * ERP销售组织 Service 接口

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java

@@ -1,24 +1,21 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpSalesOrganizationSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpSalesOrganizationMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_SALES_ORGANIZATION_NOT_EXISTS;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
 
 /**
  * ERP销售组织 Service 实现类

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpWarehouseService.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * ERP库位 Service 接口

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/erp/ErpWarehouseServiceImpl.java

@@ -1,24 +1,21 @@
 package cn.iocoder.yudao.module.erp.service.erp;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.*;
-import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpWarehouseSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpWarehouseMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.ERP_WAREHOUSE_NOT_EXISTS;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
 
 /**
  * ERP库位 Service 实现类

yudao-module-erp/yudao-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml

@@ -0,0 +1,12 @@
+<?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="cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpAssetMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-module-erp/yudao-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml

@@ -0,0 +1,12 @@
+<?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="cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpContractMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-module-erp/yudao-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml

@@ -0,0 +1,12 @@
+<?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="cn.iocoder.yudao.module.erp.dal.mysql.erp.ErpProductiveOrderMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>