Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -1051,10 +1051,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
-                cell.setCellValue(editFloat(paymentManagement1.getSolidGrainPrice()));
+                cell.setCellValue(new Formatter().format("%.4f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
-                cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getPureWeight())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(14);
                 cell.setCellValue(new Formatter().format("%.1f", editFloat(paymentManagement1.getAmountIngPayable())).toString());

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

@@ -245,7 +245,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                 .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask!=null){
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getPureWeight());
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }
@@ -265,7 +265,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask!=null){
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getPureWeight());
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }