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

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

@@ -19,6 +19,7 @@ import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractOtherFieldDO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractOtherFormDO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO;
+import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO;
 import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDetailDO;
@@ -26,6 +27,7 @@ import com.zt.plat.module.contractorder.dal.mysql.contract.ContractMainMapper;
 import com.zt.plat.module.contractorder.dal.mysql.contract.ContractOtherFieldMapper;
 import com.zt.plat.module.contractorder.dal.mysql.contract.ContractOtherFormMapper;
 import com.zt.plat.module.contractorder.dal.mysql.contract.SystemRelativityMapper;
+import com.zt.plat.module.contractorder.dal.mysql.purchaseorder.PrchOrdDtlMapper;
 import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderDetailMapper;
 import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderMapper;
 import com.zt.plat.module.contractorder.enums.contract.DictEnum;
@@ -639,4 +641,16 @@ public class ContractApiImpl implements ContractApi {
         List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids);
         return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
     }
+
+    @Override
+    public CommonResult<PrchOrdDtlDTO> getPoOrderDetailById(Long id) {
+        PrchOrdDtlDO prchOrdDtlDO = SpringUtil.getBean(PrchOrdDtlMapper.class).selectById(id);
+        return  success(BeanUtils.toBean(prchOrdDtlDO, PrchOrdDtlDTO.class));
+    }
+
+    @Override
+    public CommonResult<List<PrchOrdDtlDTO>> getPoOrderDetailByIds(List<Long> ids) {
+        List<PrchOrdDtlDO> prchOrdDtlDOS = SpringUtil.getBean(PrchOrdDtlMapper.class).selectList(PrchOrdDtlDO::getId, ids);
+        return  success(BeanUtils.toBean(prchOrdDtlDOS, PrchOrdDtlDTO.class));
+    }
 }

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/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java

@@ -133,7 +133,6 @@ public class SalesOrderSaveReqVO {
     private String erpSalesCompanyName;
 
 
-
     @Schema(description = "ERP状态(字典: ERP_REQ_STS)", example = "2")
     private String erpStatus;
 
@@ -172,17 +171,10 @@ public class SalesOrderSaveReqVO {
     @ExcelProperty("订单分类")
     private String splyBsnTp;
 
-    /**
-     * 销售组织编码
-     *
-     */
     @Schema(description = "销售组织编码", example = "2")
     @ExcelProperty("销售组织编码")
     private String saleOrgzCd;
-    /**
-     * 销售组织名称
-     *
-     */
+
     @Schema(description = "销售组织名称", example = "2")
     @ExcelProperty("销售组织名称")
     private String saleOrgzName;
@@ -200,4 +192,10 @@ public class SalesOrderSaveReqVO {
     @Schema(description = "产品组编码")
     @ExcelProperty("产品组编码")
     private String pdtGrpCdg;
+    @Schema(description = "付款方名称")
+    @ExcelProperty("付款方名称")
+    private String payerName;
+    @Schema(description = "付款方编码")
+    @ExcelProperty("付款方编码")
+    private String payerNum;
 }

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/dal/dataobject/salesorder/SalesOrderDO.java

@@ -295,7 +295,7 @@ public class SalesOrderDO extends BusinessBaseDO {
      * 付款方名称
      *
      */
-    @TableField("PYER_NUM")
+    @TableField("PYER_NAME")
     private String payerName;
     /**
      * 付款方编码
@@ -303,9 +303,9 @@ public class SalesOrderDO extends BusinessBaseDO {
      */
     @TableField("PYER_NUM")
     private String payerNum;
-    /**
-     * 税码
-     */
-    @TableField("TAX_NUM")
-    private String taxNum;
+//    /**
+//     * 税码
+//     */
+//    @TableField("TAX_NUM")
+//    private String taxNum;
 }

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);
+    }
 }