zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托加工更新提交erp优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-26 10:51:52 +08:00
parent 9d6e410720
commit 3ad1353a00
11 changed files with 94 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java
View File

@@ -20,4 +20,8 @@ public class ErpConstants {
public static final String TOKEN_ = "-";//连接标识
public static final String DATE_FORMAT_YYYYMMDD = "yyyyMMdd";
public static final String MTRL_ZHONGTONG_CODE = "mtrlZhongtongCode";
public static final String ACTS_CTGR_S = "S";
public static final String ACTS_CTGR_A = "A";
public static final String ACTS_CTGR_F = "F";
public static final String ACTS_CTGR_K = "K";
}

1
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java
View File

@@ -26,4 +26,5 @@ public interface ErrorCodeConstants {
ErrorCode PURCHASE_ORDER_ID_IS_EMPTY = new ErrorCode(1_008_000_080, "业务订单类型非法，请参考字典：SPLY_BSN_TP");
ErrorCode PURCHASE_ORDER_NOT_ALLOW_BIND = new ErrorCode(1_008_000_090, "来料销售加工订单不允许绑定订单");
ErrorCode ORDER_ALREADY_SUBMIT = new ErrorCode(1_008_000_100, "不允许重复提交erp");
ErrorCode ERP_ERO =new ErrorCode(1_008_000_200,"{}");
}

10
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
View File

@@ -257,5 +257,15 @@ public class ContractController implements BusinessControllerMarker {
return success(true);
}
//取消合同关联
@DeleteMapping("/cancel-relation")
@Operation(summary = "取消合同关联")
@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
public CommonResult<Boolean> cancelRelation(@RequestParam("id") Long id) {
contractService.cancelRelation(id);
return success(true);
}
}

16
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java
View File

@@ -51,14 +51,14 @@ public class OriginalMaterialProcessingController {
@PostMapping("/create-batch")
@Operation(summary = "批量创建来料加工订单")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:create')")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:create','entedOrder:add')")
public CommonResult<List<OriginalMaterialProcessingRespVO>> createBatchOriginalMaterialProcessingOrder(@Valid @RequestBody List<OriginalMaterialProcessingSaveReqVO> createReqVOS) {
return success(originalMaterialProcessingService.createBatchOriginalMaterialProcessing(createReqVOS));
}
@PutMapping("/update")
@Operation(summary = "更新来料加工订单")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:update')")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:update','entedOrder:add')")
public CommonResult<Boolean> updateOriginalMaterialProcessingOrder(@Valid @RequestBody OriginalMaterialProcessingSaveReqVO updateReqVO) {
originalMaterialProcessingService.updateOriginalMaterialProcessing(updateReqVO);
return success(true);
@@ -67,7 +67,7 @@ public class OriginalMaterialProcessingController {
@DeleteMapping("/delete")
@Operation(summary = "删除来料加工订单")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete')")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete','entedOrder:edit')")
public CommonResult<Boolean> deleteOriginalMaterialProcessingOrder(@RequestParam("id") Long id) {
originalMaterialProcessingService.deleteOriginalMaterialProcessing(id);
return success(true);
@@ -76,7 +76,7 @@ public class OriginalMaterialProcessingController {
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除来料加工订单")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete')")
@PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete','entedOrder:edit')")
public CommonResult<Boolean> deleteOriginalMaterialProcessingOrderList(@RequestBody BatchDeleteReqVO req) {
originalMaterialProcessingService.deleteOriginalMaterialProcessingListByIds(req.getIds());
return success(true);
@@ -134,7 +134,7 @@ public class OriginalMaterialProcessingController {
//关联订单
@PostMapping("/link-order")
@Operation(summary = "关联订单")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','original-material-processing:order:list:OrderList:edit')")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','original-material-processing:order:list:OrderList:edit','entedOrder:edit')")
public CommonResult<Boolean> linkOrder(@RequestBody @Validated LinkOrderReqVO req) {
return success(originalMaterialProcessingService.linkOrder(req));
}
@@ -149,7 +149,7 @@ public class OriginalMaterialProcessingController {
@PostMapping("/bound-order")
@Operation(summary = "获取已绑定的订单")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:query')")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:query','entedOrder:edit')")
public CommonResult<List<OriginalMaterialProcessingRespVO>> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) {
return success(originalMaterialProcessingService.getBindOrderByOrder(reqVO));
}
@@ -157,7 +157,7 @@ public class OriginalMaterialProcessingController {
//关闭订单
@PostMapping("/close-order")
@Operation(summary = "关闭订单")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update')")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','entedOrder:edit')")
public CommonResult<Boolean> closeOrder(@RequestBody List<Long> ids) {
originalMaterialProcessingService.closeOrder(ids);
return success(true);
@@ -165,7 +165,7 @@ public class OriginalMaterialProcessingController {
//来料采购提交erp
@PostMapping("/submit-to-erp")
@Operation(summary = "来料采购提交erp")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update')")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','entedOrder:edit')")
public CommonResult<Boolean> submitToErp(@RequestParam("id") Long id) {
originalMaterialProcessingService.submitToErp(id);
return success(true);

5
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
View File

@@ -147,7 +147,8 @@ public class PurchaseOrderController implements BusinessControllerMarker {
@Operation(summary = "推送ERP订单", description = "061')")
@PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:update','purchase:order:list:OrderList:edit')")
public CommonResult<?> submitErp061(@RequestParam("id") String id) {
return success(purchaseOrderService.submitErp061(List.of(Long.valueOf(id))));
purchaseOrderService.submitErp061(List.of(Long.valueOf(id)));
return success(true);
}
@PostMapping("/submit-erp062")
@@ -235,7 +236,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
return success(true);
}
//获取关联订单
@PostMapping("/get-no-permission")
@GetMapping("/get-no-permission")
@Operation(summary = "获取关联订单--无权限(新)")
@PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:query')")
public CommonResult<OrderRespVO> getOrderNoPermission(@RequestParam("id") Long id) {

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
View File

@@ -273,4 +273,6 @@ public interface ContractService {
* @param id 合同id
*/
void pushMsgById(Long id,Long userId);
void cancelRelation(Long id);
}

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -2266,7 +2266,25 @@ public class ContractServiceImpl implements ContractService {
notifyMessageSendApi.sendSingleMessageToMember(notifySendSingleToUserReqDTO);
}
/**Object
@Transactional(rollbackFor = Exception.class)
@CompanyDataPermissionIgnore
@DeptDataPermissionIgnore
@TenantIgnore
@Override
public void cancelRelation(Long id) {
ContractMainDO contractMainDO = contractMainMapper.selectById(id);
if (contractMainDO != null) {
Long relatedContractId = contractMainDO.getRelatedContractId();
//取消关联。置空relatedContractId
LambdaUpdateWrapper<ContractMainDO> wrapper=new LambdaUpdateWrapper<>();
wrapper.set(ContractMainDO::getRelatedContractId,null)
.in(ContractMainDO::getId,List.of(relatedContractId, id));
contractMainMapper.update(wrapper);
}
}
/**
* Object
* 校验合同内容
*
* @param contract 合同数据

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java
View File

@@ -66,7 +66,7 @@ public interface PurchaseOrderService {
String submitOrder(Long id);
String submitErp061(List<Long> ids);
void submitErp061(List<Long> ids);
boolean submitErp062ByUpdate(Long id);

68
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderSaveReqVO.java
View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
@@ -38,7 +39,9 @@ public class ErpOrderSaveReqVO {
@Valid
private List<Itex> itex; // 行项目扩展信息
private JSONArray accts; // 科目分配信息(科目分配类别为K或P时使用)
@Schema(description = "行项目-科目分配（科目分配类别为K、P和A时使用）")
private List<JSONObject> accts;
@Valid
private List<Comp> comps; // 委托加工物料信息(委托加工订单时使用)
@@ -193,6 +196,9 @@ public class ErpOrderSaveReqVO {
// @Schema(description = "行项目科目分配信息")
// @Data
// public static class Acct {
// @Schema(description = "行号", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "行号不能为空")
// private Integer po_item;
// @Schema(description = "科目分配序号(从1开始)", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "科目分配序号不能为空")
// private Integer serial_no; // DZEKKN NUMC2

Some files were not shown because too many files have changed in this diff Show More