订单管理相关

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

@@ -5,6 +5,7 @@ import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -154,7 +155,11 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     //查询物料接口
     @GetMapping("/material")
     @Operation(summary = "查询物料接口")
-    public CommonResult<MaterialRespVO> getMaterialList(@RequestParam @Validated @NotEmpty(message = "采购订单号不能为空") String orderNo){
+    public CommonResult<MaterialRespVO> getMaterialList(@RequestParam
+                                                            @Schema(description = "采购订单号")
+                                                            @Validated
+                                                            @NotEmpty(message = "采购订单号不能为空")
+                                                            String orderNo){
         return purchaseOrderService.getMaterial(orderNo);
     }
 

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

@@ -42,7 +42,7 @@ public class PrchOrdDtlPageReqVO extends PageParam {
     private String qty;
 
     @Schema(description = "计量单位;推送ERP（必须）")
-    private BigDecimal unt;
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）")
     private BigDecimal inTaxUprc;

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

@@ -55,7 +55,7 @@ public class PrchOrdDtlRespVO {
 
     @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("计量单位;推送ERP（必须）")
-    private BigDecimal unt;
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("含税单价;推送ERP（必须）")

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

@@ -51,8 +51,8 @@ public class PrchOrdDtlSaveReqVO {
     private String qty;
 
     @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "计量单位;推送ERP（必须）不能为空")
-    private BigDecimal unt;
+    @NotEmpty(message = "计量单位;推送ERP（必须）不能为空")
+    private String unt;
 
     @Schema(description = "含税单价;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "含税单价;推送ERP（必须）不能为空")

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

@@ -54,6 +54,9 @@ public class PurchaseOrderPageReqVO extends PageParam {
     @Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）")
     private String purchaseGroup;
 
+    @Schema(description = "计量单位")
+    private String unt;
+
     @Schema(description = "货币码(字典:CUR);推送ERP（必须）")
     private String currencyNumber;
 

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

@@ -65,6 +65,9 @@ public class PurchaseOrderRespVO {
     @ExcelProperty("收货库位编码;推送ERP")
     private String receiveWarehouseNumber;
 
+    @Schema(description = "计量单位")
+    private String unt;
+
     @Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）")
     private String purchaseGroup;

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

@@ -99,6 +99,11 @@ public class PurchaseOrderSaveReqVO {
 //    @NotEmpty(message = "订单编码不能为空")
 //    private String orderNumber;
 
+
+    @Schema(description = "计量单位")
+    @NotEmpty(message = "计量单位(unt)不能为空")
+    private String unt;
+
     @Schema(description = "系统合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "系统合同编号不能为空")
     private String contractNumber;

zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml

@@ -56,6 +56,7 @@
         po.UPDATE_TIME,
         po.CREATOR,
         po.UPDATER,
+        po.UNT,
         po.DELETED,
         pod.ID as pod_id,
         pod.ORD_ID,
@@ -137,6 +138,7 @@
         po.PPR_CTRT_NUM,
         po.AGR_NUM,
         po.RMK,
+        po.UNT,
         po.AGT_NUM,
         po.AGT_NAME,
         po.CTRT_NUM,