委托加工和来料加工feign接口字段映射

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

@@ -248,7 +248,7 @@ public class OrderApiImpl implements OrderApi {
         SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class);
         PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class);
         updateOrderLstQtyDTOS.forEach(f -> {
-            if ("SALE".equals(f.getSplyBsnTp())) {
+            if (OrderTypeEnum.SALE.getCode().equals(f.getSplyBsnTp())) {
                 SalesOrderDetailDO salesOrderDetailDO = salesOrderDetailMapper.selectById(f.getOrderDetailId());
                 // 处理 trfQty 可能为 null 的情况，默认值 0
                 BigDecimal lstQty = Optional.ofNullable(salesOrderDetailDO.getTrfQty())
@@ -261,7 +261,7 @@ public class OrderApiImpl implements OrderApi {
                 updateDO.setTrfQty(lstQty.subtract(f.getLstQty())); // 减法
                 log.info("更新销售订单明细：{}", updateDO);
                 salesOrderDetailMapper.updateById(updateDO);
-            } else if ("PUR".equals(f.getSplyBsnTp())) {
+            } else if (OrderTypeEnum.PUR.getCode().equals(f.getSplyBsnTp())) {
                 // 采购
                 PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId());
                 BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty())
@@ -274,6 +274,12 @@ public class OrderApiImpl implements OrderApi {
                 updateDO.setLstQty(lstQty.subtract(f.getLstQty()));
                 log.info("更新销售订单明细：{}", updateDO);
                 prchOrdDtlMapper.updateById(updateDO);
+            } else if (OrderTypeEnum.ENT.getCode().equals(f.getSplyBsnTp())) {
+                // 委托加工
+            } else if (OrderTypeEnum.ENTED_SALE.getCode().equals(f.getSplyBsnTp())) {
+                // 来料销售
+            } else if (OrderTypeEnum.ENTED_PUR.getCode().equals(f.getSplyBsnTp())) {
+                // 来料采购
             } else {
                 throw new RuntimeException("请求数据错误");
             }

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

@@ -241,5 +241,12 @@ public class ContractController implements BusinessControllerMarker {
         PageResult<ContractMainDO> pageResult = contractService.getPageNoPermission(pageReqVO);
         return success(BeanUtils.toBean(pageResult, ContractRespVO.class));
     }
+    @GetMapping("/get-no-permission")
+    @Operation(summary = "获得合同分页列表-没有权限")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
+    public CommonResult<ContractRespVO> getNoPermission(@RequestParam("id") Long id) {
+        ContractRespVO contractRespVO = contractService.getNoPermission(id);
+        return success(contractRespVO);
+    }
 
 }

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

@@ -50,7 +50,13 @@ public interface ContractService {
      * @return 合同信息
      */
     ContractRespVO get(Long id);
-
+    /**
+     * 获得合同详情--无权限
+     *
+     * @param id 合同ID
+     * @return 合同信息
+     */
+    ContractRespVO getNoPermission(Long id);
     /**
      * 修改合同
      *