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 16:40:42 +08:00
parent 403c385eae
commit 924896b435
9 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java
View File

@@ -141,8 +141,6 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
@Override
public void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
tmplInscBsnRelRespVO.setDeptIds(setDeptData(tmplInscBsnRelRespVO));//获取部门使用范围
// tmplInscBsnRelRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(tmplInscBsnRelRespVO));//获取条款;
// tmplInscBsnRelRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(tmplInscBsnRelRespVO)); // 实例字段
//业务条款
tmplInscBsnRelRespVO.setTmplInscItmBsnRespVOS(setTmplInscItmBsnRespVOS(tmplInscBsnRelRespVO));
//业务字段
@@ -150,10 +148,6 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
if (!tmplInscBsnRelRespVO.getDeptIds().isEmpty()) {
tmplInscBsnRelRespVO.setDeptRespVOS(deptApi.getDeptList(tmplInscBsnRelRespVO.getDeptIds().stream().map(Long::valueOf).toList()).getData()); // 部门详情
}
// TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId());
// if (templateInstance != null) {
// tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名");
// }
}
@Override
@@ -188,15 +182,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
//业务字段
private List<TmplInscDatBsnRespVO> setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>().eq(TmplInscDatBsnDO::getBsnId, tmplInscBsnRelRespVO.getId())), TmplInscDatBsnRespVO.class);
// tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> {
// if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) {
// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy());
// tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy());
// }
// }));
return tmplInscDatBsnRespVOS;
return BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>().eq(TmplInscDatBsnDO::getBsnId, tmplInscBsnRelRespVO.getId())), TmplInscDatBsnRespVO.class);
}
// 实例数据

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java
View File

@@ -30,6 +30,7 @@ public interface TmplInscDatBsnService {
* @param updateReqVO 更新信息
*/
void updateTmplInscDatBsn(@Valid TmplInscDatBsnSaveReqVO updateReqVO);
void updateTmplInscDatBsnList(@Valid List<TmplInscDatBsnSaveReqVO> updateReqVOS);
void updateTmplInscDatBsnBatch(@Valid List<TmplInscDatBsnSaveReqVO> updateReqVOS);
/**

12
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java
View File

@@ -66,6 +66,18 @@ public class TmplInscDatBsnServiceImpl implements TmplInscDatBsnService {
tmplInscDatBsnMapper.insert(saveObj);
}
@Override
public void updateTmplInscDatBsnList(List<TmplInscDatBsnSaveReqVO> updateReqVOS) {
// 校验存在
// validateTmplInscDatBsnExists(updateReqVO.getId());
// 物理删除旧记录
tmplInscDatBsnMapper.physicalDeleteByBsnIds(updateReqVOS.stream().map(TmplInscDatBsnSaveReqVO::getBsnId).toList());
List<TmplInscDatBsnDO> beanList = BeanUtils.toBean(updateReqVOS, TmplInscDatBsnDO.class);
beanList.forEach(bean -> bean.setId(null));
tmplInscDatBsnMapper.insertBatch(beanList);
}
@Override
public void updateTmplInscDatBsnBatch(List<TmplInscDatBsnSaveReqVO> updateReqVOS) {
tmplInscDatBsnMapper.physicalDeleteByBsnIds(updateReqVOS.stream().map(TmplInscDatBsnSaveReqVO::getBsnId).toList());

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

@@ -6,7 +6,10 @@ import cn.hutool.json.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.CompanyDataPermissionIgnore;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.tenant.core.aop.TenantIgnore;
import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
import com.zt.plat.module.contractorder.api.dto.order.PrchOrdDtlDTO;
import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
@@ -514,6 +517,9 @@ public class ContractApiImpl implements ContractApi {
}
@Override
@CompanyDataPermissionIgnore
@DeptDataPermissionIgnore
@TenantIgnore
public CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderIds(List<Long> ids) {
if (ids == null || ids.isEmpty()) {
throw new RuntimeException("订单id为空");

9
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -5,7 +5,10 @@ import com.zt.plat.framework.common.exception.ErrorCode;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.CompanyDataPermissionIgnore;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.tenant.core.aop.TenantIgnore;
import com.zt.plat.module.contractorder.api.dto.order.*;
import com.zt.plat.module.contractorder.dal.dataobject.entrustorder.EntrustOrderDetailDO;
import com.zt.plat.module.contractorder.dal.dataobject.originalmaterialprocessing.OriginalMaterialProcessingDetailDO;
@@ -43,6 +46,9 @@ public class OrderApiImpl implements OrderApi {
private PurchaseOrderService purchaseOrderService;
@Override
@CompanyDataPermissionIgnore
@DeptDataPermissionIgnore
@TenantIgnore
public CommonResult<List<OrderDTO>> getOrderByOrderIds(List<Long> ids) {
if (ids == null || ids.isEmpty()) {
throw new RuntimeException("订单id为空");
@@ -94,6 +100,9 @@ public class OrderApiImpl implements OrderApi {
}
@Override
@CompanyDataPermissionIgnore
@DeptDataPermissionIgnore
@TenantIgnore
public CommonResult<List<OrderDTO>> getOrderByOrderNos(List<String> orderNoS) {
List<PurchaseOrderDO> orderByNos = purchaseOrderService.getOrderByNos(orderNoS);
if (orderByNos.isEmpty()) {

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

@@ -163,7 +163,7 @@ public class OriginalMaterialProcessingController {
return success(true);
}
//来料采购提交erp
@PostMapping("/submit-to-erp")
@PostMapping(value = {"/submit-to-erp","/submit-erp061","/submit-erp091"})
@Operation(summary = "来料采购提交erp")
@PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','entedOrder:edit')")
public CommonResult<Boolean> submitToErp(@RequestParam("id") Long id) {

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

@@ -1098,9 +1098,10 @@ public class ContractServiceImpl implements ContractService {
// 更新合同动态字段
if (reqVO.getDynamicsFields() != null && !reqVO.getDynamicsFields().isEmpty()) {
reqVO.getDynamicsFields().forEach(field -> {
tmplInscDatBsnService.updateTmplInscDatBsn(field);
});
tmplInscDatBsnService.updateTmplInscDatBsnList(reqVO.getDynamicsFields());
// reqVO.getDynamicsFields().forEach(field -> {
// tmplInscDatBsnService.updateTmplInscDatBsn(field);
// });
}
// 更新合同动态表单
if (reqVO.getDynamicsItems() != null && !reqVO.getDynamicsItems().isEmpty()) {

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

@@ -483,7 +483,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
throw exception(ORIGINAL_MATERIAL_PROCESSING_DO_NOT_EXISTS);
}
if (!originalMaterialProcessingDO.getOrderSAPNumber().isEmpty()) {
if (originalMaterialProcessingDO.getOrderSAPNumber()!=null) {
throw exception(ORDER_ALREADY_SUBMIT);
}

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

@@ -309,12 +309,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void submitErp061(List<Long> ids) {
// 通过订单号查询订单
List<PurchaseOrderWithDetailsVO> purchaseOrderWithDetailsVOS = purchaseOrderMapper.selectOrderByIds(ids);
if (!purchaseOrderWithDetailsVOS.isEmpty()) {
purchaseOrderWithDetailsVOS.forEach(purchaseOrderWithDetailsVO -> {
PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseOrderWithDetailsVO.getPurchaseOrder().getId());
if (purchaseOrderDO.getOrderSAPNumber() != null && !purchaseOrderDO.getOrderSAPNumber().isEmpty()) {
throw exception(ORDER_ALREADY_SUBMIT);
}
ErpOrderSaveReqVO erpOrderSaveReqVO = new ErpOrderSaveReqVO();
PurchaseOrderDO order = purchaseOrderWithDetailsVO.getPurchaseOrder();
erpOrderSaveReqVO.setOrderNo(order.getSystemOrderNumber());
@@ -407,7 +411,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
itex.setZaufnr(detail.getInOrd()); // 统计型内部订单 -> 统计型内部订单
itex.setZpurty(detail.getPrchCtgr()); // 采购类别 -> 采购类别
itex.setZmenge(detail.getOrigWet()); // 原料湿重 -> 原料湿重
itexes.add(itex); JSONArray objects = JSONArray.parseArray(detail.getActsCtgrDtl());
itexes.add(itex);
JSONArray objects = JSONArray.parseArray(detail.getActsCtgrDtl());
for (Object object : objects) {
if (object instanceof JSONObject jsonObj) {
jsonObj.remove("costcenter_name");
@@ -1073,6 +1078,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
}
@Override
@CompanyDataPermissionIgnore
@DeptDataPermissionIgnore
@TenantIgnore
public OrderRespVO getOrder(Long id) {
PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(id);
OrderRespVO bean = BeanUtils.toBean(purchaseOrderDO, OrderRespVO.class);