新增通过采购订单明细id获取明细

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java

@@ -29,6 +29,10 @@ public class TemplateInstanceDataRespVO {
     @ExcelProperty("字段标识;关联字段库")
     private String fldKy;
 
+    @Schema(description = "字段結構", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段結構;")
+    private String fldDoc;
+
     @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("用户填写的值")
     private String fldVal;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java

@@ -48,4 +48,8 @@ public class TemplateInstanceDataDO extends BusinessBaseDO {
     @TableField(exist = false)
     private String fldName;
 
+    @TableField(exist = false)
+    private String fldDoc;
+
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java

@@ -417,6 +417,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
             tmplTpListByValKeys.forEach(tmplTpFldDO -> {
                 if (templateInstanceDataRespVO.getFldKy().equals(tmplTpFldDO.getFldKy())) {
                     templateInstanceDataRespVO.setFldName(tmplTpFldDO.getFldName());
+                    templateInstanceDataRespVO.setFldDoc(tmplTpFldDO.getFldDoc());
                 }
             });
         });

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

@@ -65,4 +65,6 @@ public interface ContractApi {
     @GetMapping(PREFIX + "/po-order-detail-by-ids")
     @Operation(summary = "通过采购订单详情id批量获取消费订单详情")
     CommonResult<List<PrchOrdDtlDTO>> getPoOrderDetailByIds(@RequestParam("ids") List<Long> ids);
+
+    //销售采购融合。主子表
 }

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

@@ -109,6 +109,11 @@ public class PurchaseOrderWithDetailsDTO {
      * 物料编码
      */
     private String materialNumber;
+
+    /**
+     * 单位
+     */
+    private String unt;
     /**
      * 物料名称
      */

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

@@ -100,6 +100,20 @@ public class SalesOrderController implements BusinessControllerMarker {
         return success(salesOrderRespVO);
     }
 
+    @GetMapping("/order-no")
+    @Operation(summary = "通过订单号获得销售订单")
+    @Parameter(name = "orderNo", description = "订单号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('base:sales-order:query')")
+    public CommonResult<SalesOrderRespVO> getSalesOrderByNo(@RequestParam("orderNo") String  orderNo) {
+        SalesOrderDO purchaseOrder = salesOrderService.getSalesOrderByOrderNo(orderNo);
+        SalesOrderRespVO salesOrderRespVO = BeanUtils.toBean(purchaseOrder, SalesOrderRespVO.class);
+        if (salesOrderRespVO == null) {
+            return success(null);
+        }
+        salesOrderService.setSalesOrderDetail(salesOrderRespVO);
+        return success(salesOrderRespVO);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得销售订单分页")
     @PreAuthorize("@ss.hasPermission('base:sales-order:query')")

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

@@ -278,4 +278,9 @@ public class PurchaseOrderDO extends BusinessBaseDO {
     @TableField("SALE_ACS_NAME")
     private String saleAcsName;
 
+    /**
+     * 税率
+     */
+    @TableField("TAX_RTE")
+    private BigDecimal taxRte;
 }

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

@@ -121,4 +121,11 @@ public interface SalesOrderService {
      *
      */
    void updateOrderStatusByIdOrOrderNo(OrderStsReqVO req);
+   /**
+     * 获取订单详情
+     *
+     * @param orderNo 订单编号
+     *
+     */
+    SalesOrderDO getSalesOrderByOrderNo(String orderNo);
 }

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

@@ -524,6 +524,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         salesOrderMapper.update(new LambdaUpdateWrapper<SalesOrderDO>().in(reqVO.getOrderNos() != null, SalesOrderDO::getSystemOrderNumber, reqVO.getOrderNos()).in(reqVO.getIds() != null, SalesOrderDO::getId, reqVO.getIds()).set(SalesOrderDO::getStatus, reqVO.getSts()));
     }
 
+
+
     private void validateSalesOrderNosExists(List<String> orderNos) {
         List<SalesOrderDO> list = salesOrderMapper.selectList(new LambdaQueryWrapper<SalesOrderDO>().in(SalesOrderDO::getSystemOrderNumber, orderNos));
         if (CollUtil.isEmpty(list) || list.size() != orderNos.size()) {
@@ -546,4 +548,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         int number = (int) (Math.random() * 900000 + 100000);
         return String.valueOf(number);
     }
+
+    @Override
+    public SalesOrderDO getSalesOrderByOrderNo(String orderNo) {
+        return salesOrderMapper.selectOne(SalesOrderDO::getSystemOrderNumber, orderNo);
+    }
 }