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

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java

@@ -42,7 +42,7 @@ public interface ContractApi {
 
     @PostMapping(PREFIX + "/push")
     @Operation(summary = "国贸2.0系统推送合同")
-    CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) throws Exception;
+    CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO);
 
     @GetMapping(PREFIX + "/logistics/list/page")
     @Operation(summary = "国贸2.0系统合同分页查询")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java

@@ -8,6 +8,9 @@ import lombok.Getter;
 @Getter
 public enum DictEnum {
 
+    /** 方式系统 */
+    BSE_SYS_REL_WY_EXTERNAL("系统外关联","EXTERNAL",null),
+    BSE_SYS_REL_WY_INTERNAL("内关联","INTERNAL",null),
     /** 供应链业务大类 */
     SPLY_BSN_TP_03BX("货物保险","03BX",null),
     SPLY_BSN_TP_11CC("货物保管仓储","11CC",null),

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

@@ -26,7 +26,6 @@ import java.util.List;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.error;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_PUSH_FAIL;
 import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL;
 
 @Slf4j
@@ -197,11 +196,7 @@ public class ContractController implements BusinessControllerMarker {
     @Operation(summary = "国贸2.0系统推送合同")
     @PreAuthorize("@ss.hasPermission('base:contract:create')")
     CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) {
-        try {
+        return contractApi.push(reqVO);
-            return contractApi.push(reqVO);
-        } catch (Exception e) {
-            return error(CONTRACT_PUSH_FAIL, e.getMessage());
-        }
     }
 
     @PostMapping("/logistics/list/page")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java

@@ -61,6 +61,7 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
                 .eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR")
                 .eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause())
                 .eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(PurchaseOrderDO::getMtrlTp, reqVO.getMtrlTp())
                 .likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
                 .orderByDesc(PurchaseOrderDO::getId));
     }

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

@@ -921,8 +921,10 @@ public class ContractServiceImpl implements ContractService {
         }
 
         // 更新合同主信息
+        Long instanceId = newContractMainDO.getInstanceId();
+        newContractMainDO.setInstanceId(null);
         contractMainMapper.update(newContractMainDO, new LambdaUpdateWrapper<>(ContractMainDO.class)
-                .set(ContractMainDO::getInstanceId, newContractMainDO.getInstanceId())
+                .set(ContractMainDO::getInstanceId, instanceId)
                 .eq(ContractMainDO::getId, newContractMainDO.getId()));
 
         if (DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(newContractMainDO.getStatus())) {