更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentManagement.java

@@ -52,11 +52,11 @@ public class RepaymentManagement extends BaseModel<RepaymentManagement> {
     /**
      * 待还金额(元)
      */
-    private Float repaymentIngAmount;
+    private Double repaymentIngAmount;
     /**
      * 还款金额(元)
      */
-    private Float repaymentEdAmount;
+    private Double repaymentEdAmount;
     /**
      * 还款日期
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TradeWarehouseReceiptAppl.java

@@ -119,39 +119,39 @@ public class TradeWarehouseReceiptAppl extends BaseModel<TradeWarehouseReceiptAp
     /**
      * 本单重量
      */
-    private Float weight;
+    private Double weight;
     /**
      * 现有储量
      */
-    private Float nowWeight;
+    private Double nowWeight;
     /**
      * 可用储量
      */
-    private Float useWeight;
+    private Double useWeight;
     /**
      * 单价（元/吨）
      */
-    private Float unitPrice;
+    private Double unitPrice;
     /**
      * 总价值
      */
-    private Float totalValue;
+    private Double totalValue;
     /**
      * 发放金额
      */
-    private Float paymentAmount;
+    private Double paymentAmount;
     /**
      * 应还金额
      */
-    private Float amountDue;
+    private Double amountDue;
     /**
      * 已还金额
      */
-    private Float amountRepaid;
+    private Double amountRepaid;
     /**
      * 待还金额
      */
-    private Float amountToRepaid;
+    private Double amountToRepaid;
     /**
      * 申请比例
      */
@@ -159,23 +159,23 @@ public class TradeWarehouseReceiptAppl extends BaseModel<TradeWarehouseReceiptAp
     /**
      * 申请金额
      */
-    private Float interest;
+    private Double interest;
     /**
      * 利息
      */
-    private Float applicationAmount;
+    private Double applicationAmount;
     /**
      * 监管费
      */
-    private Float supervisionFee;
+    private Double supervisionFee;
     /**
      * 保险费
      */
-    private Float insurancePremium;
+    private Double insurancePremium;
     /**
      * 其他费
      */
-    private Float otherFee;
+    private Double otherFee;
     /**
      * 利息显示隐藏
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -295,7 +295,21 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      */
     @Override
     public List<CommonCompany> getComp() {
-        return commonCompanyService.selectList(new EntityWrapper<CommonCompany>().eq("delete_flag", "0"));
+        List<CommonCompany> commonCompanyList =commonCompanyService.selectList(new EntityWrapper<CommonCompany>().eq("delete_flag", "0"));
+        List<CommonCompany> temp = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(commonCompanyList)){
+            for (CommonCompany commonCompany:commonCompanyList){
+                if(commonCompany.getCompName().contains("中天昊元")){
+                    temp.add(commonCompany);
+                }
+            }
+            for (CommonCompany commonCompany:commonCompanyList){
+                if(!commonCompany.getCompName().contains("中天昊元")){
+                    temp.add(commonCompany);
+                }
+            }
+        }
+        return temp;
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -151,7 +151,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
                     // 以库位为维度查询
                     List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                            .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number"));
+                            .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
                     if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                         for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                             WarehouseView warehouseView = new WarehouseView();
@@ -500,7 +500,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
                 if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                     for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                         //查询仓库内的货名
@@ -528,11 +528,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         WarehouseBaseInfo warehouseBaseInfo = this.selectById(id);
         List<WarehousePositionInfo> warehousePositionInfoList = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                 .eq("base_id", id)
-                .eq("delete_flag", "0"));
+                .eq("delete_flag", "0").orderBy("bin_number",false));
         warehousePositionInfoList.forEach(warehousePositionInfo -> {
             List<WarehousePositionStorageInfo> warehousePositionStorageInfoList = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
                     .eq("position_id", warehousePositionInfo.getId())
-                    .eq("delete_flag", "0"));
+                    .eq("delete_flag", "0"))
+                    ;
             Float storage = 0f;
             String detailStorage = "";
             for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
@@ -590,7 +591,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 Float residual = 0f;
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfoList = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
                 if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
                     for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfoList) {
                         // 查询应余量
@@ -662,7 +663,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (warehouseBaseInfo.getWarehouseType().equals("1")) {
             //查询仓位信息
             List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                    .eq("base_id", warehouseBaseInfo.getId()));
+                    .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
             if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                 for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                     warehousePositionInfoService.deleteById(warehousePositionInfo.getId());
@@ -1237,7 +1238,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
                 if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                     for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                         //查询仓库内的货名
@@ -1335,7 +1336,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number",false));
                 if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                     for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                         //查询仓库内的货名
@@ -1344,7 +1345,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)) {
                             for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfos) {
                                 //查询贸易仓单可用储量
-                                Float useWeight = 0f;
+                                Double useWeight = 0d;
                                 List<TradeWarehouseReceiptAppl> tradeWarehouseReceiptAppls = tradeWarehouseReceiptApplService.selectList(new EntityWrapper<TradeWarehouseReceiptAppl>()
                                         .eq("warehouse_id", warehouseBaseInfo.getId())
                                         .eq("warehouse_no_id", warehousePositionInfo.getId())