楚江ERP：bug修改

@@ -252,7 +252,7 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 是否为合同创建人
      * 是否为合同创建人

@@ -216,7 +216,7 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 制单日期
      * 制单日期

@@ -316,7 +316,6 @@ public class CustomerCreditController extends DefaultBaseController {
      * @return
      * @return
      */
      */
     @ApiOperation("导出")
     @ApiOperation("导出")
-    @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
     @GetMapping("/export")
     @GetMapping("/export")
     public void export(@NotBlank(message = "ID不能为空") String id, HttpServletResponse response) {
     public void export(@NotBlank(message = "ID不能为空") String id, HttpServletResponse response) {
         try {
         try {

@@ -153,7 +153,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
             //生产人员不展示价格,根据部门判断（生产管理科、精轧一车间、精轧车间、品质管理科）,需要生产的控制价格
             //生产人员不展示价格,根据部门判断（生产管理科、精轧一车间、精轧车间、品质管理科）,需要生产的控制价格
             List<SysUserDept> userDeptList = sysUserDeptService.getByUserId(SecurityUtil.getCurrentUser().getId());
             List<SysUserDept> userDeptList = sysUserDeptService.getByUserId(SecurityUtil.getCurrentUser().getId());
-            if (CollectionUtils.isNotEmpty(userDeptList) && "PRODUCTION".equals(result.getType())) {
+            if (CollectionUtils.isNotEmpty(userDeptList)) {
                 boolean b = false;
                 boolean b = false;
                 for (SysUserDept sysUserDept : userDeptList) {
                 for (SysUserDept sysUserDept : userDeptList) {
                     String deptId = sysUserDept.getDeptId();
                     String deptId = sysUserDept.getDeptId();

@@ -184,7 +184,7 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     /**
     /**
      * 包装费
      * 包装费
      */
      */
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 订货单ID
      * 订货单ID

@@ -228,7 +228,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     /**
     /**
      * 包装费
      * 包装费
      */
      */
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 合同创建人ID
      * 合同创建人ID

@@ -217,7 +217,7 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 合同创建人ID
      * 合同创建人ID

@@ -212,6 +212,6 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
 }
 }

@@ -187,7 +187,7 @@ public class CreateOrderChangeRecordVo implements BaseVo, Serializable {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 规格变更记录
      * 规格变更记录

@@ -193,7 +193,7 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable {
      * 包装费
      * 包装费
      */
      */
     @ApiModelProperty("包装费")
     @ApiModelProperty("包装费")
-    private BigDecimal packagingFee;
+    private String packagingFee;
 
 
     /**
     /**
      * 规格变更记录
      * 规格变更记录